LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,065 Commits 2 Branches 0 Tags
930f94115d1f1dcfd64c8a7547262b74da521a41
Commit Graph

10065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
930f94115d [automerger skipped] Merge RP1A.200720.011 am: 383cdb1c99 -s ours 
am skip reason: Change-Id Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c with SHA-1 b89c6d94c5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514348

Change-Id: I735e135e519708d0e1ab07504944ad1dcdfcccbc
 2020-09-02 23:16:43 +00:00
Xin Li
383cdb1c99 Merge RP1A.200720.011 
Bug: 167588565
Merged-In: Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c
Change-Id: Ia8f5f008bc1f77115b644ab996aedc892fab68e7
 2020-09-02 12:34:37 -07:00
Xin Li
1461832820 [automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours 
am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140

Change-Id: Ie4932da5ffa8bc042a930b01a18d1ff1ce1abc90
 2020-09-02 19:15:20 +00:00
Xin Li
9fbf46da7d Mark RP1A.200720.001 as merged 
Bug: 167588565
Merged-In: I608df7327b8366fd365b11c6bdff9ed28fde99b0
Change-Id: Ie293ab2bcba5f778a7cac8476e226dc7c15e000f
 2020-09-02 11:44:54 -07:00
Xin Li
210f4c7e70 [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours 
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484850

Change-Id: I6fee791ed4a4939ab3f24b66f779a20124d0c63d
 2020-09-01 20:37:03 +00:00
Xin Li
4037c36d47 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
 2020-08-31 21:21:38 -07:00
Junyu Lai
d1804f87dc Merge "Notify the keepalive is stopped after the slot has been released" am: 09a0f57f87 am: b5e1feccbe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1112851

Change-Id: Icdd61fb39ebd14963f4ec6e591b3a245e6b999b2
 2020-08-28 11:09:43 +00:00
Junyu Lai
09a0f57f87 Merge "Notify the keepalive is stopped after the slot has been released" 2020-08-28 10:12:44 +00:00
Treehugger Robot
b54db4b9fa Merge "Skip RAT type listener registration if IMSI is not available" am: 1e9c48bfec am: a2f81d1442 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907

Change-Id: I34de6bc6dd862f8042489f60f4b6be76af7c961e
 2020-08-25 20:49:04 +00:00
Treehugger Robot
a2f81d1442 Merge "Skip RAT type listener registration if IMSI is not available" am: 1e9c48bfec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907

Change-Id: Ie24dee18456ee0741dbcd9330664398f0492c644
 2020-08-25 20:27:30 +00:00
Treehugger Robot
1e9c48bfec Merge "Skip RAT type listener registration if IMSI is not available" 2020-08-25 19:55:09 +00:00
junyulai
8c91a5f6cf Skip RAT type listener registration if IMSI is not available 
Currently, if SIM is inserted but IMSI is not available, such
as SIM PIN locked state. Information of such SIM will still
be available but IMSI is not. Which makes
NetworkStatsSubscriptionMonitor failed to store IMSI locally
for later RAT type query. Hence, NETWORK_TYPE_UNKNOWN is
always returned for such SIM.

Skip the registration until the IMSI is available. This is safe
since there will be another onSubscriptionsChanged event when
that happens.

Test: enable SIM PIN and manually test
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdUnavailable
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Bug: 160941101
Merged-In: I408379b3c432d9e62e0837d6b4f6551cc7838e29
Change-Id: I408379b3c432d9e62e0837d6b4f6551cc7838e29
(cherry-picked from ag/12400327)
 2020-08-25 18:03:38 +08:00
Paul Hu
ab51b37a2b Merge "Revert "[RFPM03] Check permission by uid."" am: 0925015de5 am: b2982a0643 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654

Change-Id: I393e91873923d7b6601d4e8c863cca6986f66f23
 2020-08-20 08:52:04 +00:00
Paul Hu
9ea57d25d8 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: bddd412feb am: 9f33dbb509 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653

Change-Id: Ifa19cb8fce8dca66ac5f4ecc7737c1c095b7b35b
 2020-08-20 08:51:45 +00:00
Paul Hu
b2982a0643 Merge "Revert "[RFPM03] Check permission by uid."" am: 0925015de5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654

Change-Id: I51b37f8e717123a2725ade859d5b9dcff19ef484
 2020-08-20 08:33:41 +00:00
Paul Hu
9f33dbb509 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: bddd412feb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653

Change-Id: I35fe76f9cfedf0619f64023e9111d9a50cc3c41c
 2020-08-20 08:27:16 +00:00
Paul Hu
0925015de5 Merge "Revert "[RFPM03] Check permission by uid."" 2020-08-20 08:24:30 +00:00
Paul Hu
bddd412feb Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" 2020-08-20 08:14:48 +00:00
Paul Hu
99653eada1 Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 324af52c7a am: 701cd3908e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652

Change-Id: I9edf5bfaa9cbc037e87f5781ba07a2c87932f3aa
 2020-08-20 07:04:43 +00:00
Paul Hu
701cd3908e Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 324af52c7a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652

Change-Id: I8cef4a21aa8fd1923334c2a99e4ff2e864f516a5
 2020-08-20 06:44:04 +00:00
Paul Hu
324af52c7a Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" 2020-08-20 06:25:06 +00:00
Paul Hu
fe640c8708 Revert "[RFPM03] Check permission by uid." 
This reverts commit f1e343c1c3.

Reason for revert: Regression in SW.  Bug:162499840

Change-Id: Ic93e762e41a728f66e200e5bc8e40ebe4c7b44f7
 2020-08-20 06:23:16 +00:00
Paul Hu
e573ac006d Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method" 
This reverts commit bfa9f182b0.

Reason for revert: Regression in SW.  Bug:162499840

Change-Id: I96bf28ffc9f2d8f3838cb6d2dac16f89a70177ed
 2020-08-20 06:23:00 +00:00
Paul Hu
9e986a8e98 Revert "[RFPM05] Add UidNetdPermissionInfo class" 
This reverts commit fbc1f34c22.

Reason for revert: Regression in SW.  Bug:162499840

Change-Id: I0e846efcc4fc06b53d97b2007e0d8e8f97c6ac10
 2020-08-20 03:10:08 +00:00
junyulai
72d2bd016b Notify the keepalive is stopped after the slot has been released 
Currently, the callbacks of stopping were fired when stop procedure
is started, because the upper layer apps only care about the reason
of stopping instead of stopping result. Thus, there is no need to
wait for the result comes back. However, this behavior generates
races if apps want to re-start keepalive immediately since the
resources are not released yet.

Fix: 134891441
Fix: 140305589
Test: atest com.android.server.ConnectivityServiceTest#testPacketKeepalives \
      --rerun-until-failure 1000

Change-Id: I987776a9211a50e964c4675b747bc10e203750f1
 2020-08-20 11:00:08 +08:00
Chalard Jean
97c4e1a647 Merge "Rename Kotlin util files to not include the Kt suffix" am: 6a8da60a32 am: 97cda73a1c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I6362695120ea8669e1da84bb686e886b85efd6a3
 2020-08-13 04:26:11 +00:00
Chalard Jean
97cda73a1c Merge "Rename Kotlin util files to not include the Kt suffix" am: 6a8da60a32 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I7e1f015c21d54591a1a25b5fa461e751bc707509
 2020-08-13 04:09:27 +00:00
Chalard Jean
6a8da60a32 Merge "Rename Kotlin util files to not include the Kt suffix" 2020-08-13 03:52:47 +00:00
Chiachang Wang
148be57009 Merge "Update language to comply with Android's inclusive language guidance" am: 64f9851e3a am: 6afddeb044 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: Ibe13b2dad841e2ade2762558d1c3978a89cb825d
 2020-08-12 10:10:11 +00:00
Chiachang Wang
6afddeb044 Merge "Update language to comply with Android's inclusive language guidance" am: 64f9851e3a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: Iecf8601b2f9e286cefca0675476d0892436d5e5b
 2020-08-12 09:52:30 +00:00
Chiachang Wang
64f9851e3a Merge "Update language to comply with Android's inclusive language guidance" 2020-08-12 09:30:11 +00:00
Paul Hu
e09d3ece31 Merge "[RFPM05] Add UidNetdPermissionInfo class" am: 255bf95e97 am: 1cc0664651 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322556

Change-Id: I0878281e2033f093f3b9cbf608c30c44bdd99278
 2020-08-12 06:53:13 +00:00
Paul Hu
1cc0664651 Merge "[RFPM05] Add UidNetdPermissionInfo class" am: 255bf95e97 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322556

Change-Id: I91a603d8b37ee750c3f582363bec94977d70014e
 2020-08-12 06:37:34 +00:00
Paul Hu
255bf95e97 Merge "[RFPM05] Add UidNetdPermissionInfo class" 2020-08-12 06:17:46 +00:00
Chiachang Wang
e6a0a2b6b9 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code
for reference.

Bug: 161896447
Test: m ; atest FrameworkNetTests
Change-Id: Ib6b4c9526992c31e05e82be80e2b9b86bc0b57ef
 2020-08-12 12:23:59 +08:00
paulhu
fbc1f34c22 [RFPM05] Add UidNetdPermissionInfo class 
Add UidNetdPermissionInfo class to store netd permission info of
each uid. Use the bit mask for combining all netd permission into
one value which can update and get the uid permission easily.
Moreover, aosp/1340042 add carryover package info into this class
which centralizes all netd permissions relevant data.

Bug: 132784544
Test: atest FrameworksNetTests
Change-Id: I3b81ea2a5017e8f4d0d603144a33c9b08640d7ba
 2020-08-12 10:33:18 +08:00
Chalard Jean
e47850dbf2 Rename Kotlin util files to not include the Kt suffix 
Callers don't care what language the utilities are written in

Test: builds
Change-Id: Ie212144f36c50db223c05f3fcb6bad745842cb5e
 2020-08-12 10:02:50 +09:00
Chalard Jean
b4d60515ab [automerger skipped] Merge changes I33b70b0a,I1074eedb am: 1fb7241345 am: a2772cf640 -s ours 
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 edadfcfae1 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725

Change-Id: I462f911d13e7574a0babd6d661c0b569f0265b58
 2020-08-07 07:16:28 +00:00
Chalard Jean
32f53e1cbb [automerger skipped] Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 403df8633d am: 40c2c5f85b -s ours 
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 edadfcfae1 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497

Change-Id: I5b15fde5cb76d1dc178a3cb2b1597e0c27aa7af2
 2020-08-07 07:16:23 +00:00
Chalard Jean
a2772cf640 Merge changes I33b70b0a,I1074eedb am: 1fb7241345 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725

Change-Id: I18869fe6bddd51f77068a91034b524f12c5a3450
 2020-08-07 06:59:30 +00:00
Chalard Jean
40c2c5f85b Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 403df8633d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497

Change-Id: Ia5e7e926bc3a9af8b03f8970738e6abe4c6d15b6
 2020-08-07 06:59:26 +00:00
Chalard Jean
1fb7241345 Merge changes I33b70b0a,I1074eedb 
* changes:
  Remove the services.net-module-wifi module target.
  Revert "Revert "Move Inet[4]AddressUtils to libs/net""
 2020-08-07 06:45:15 +00:00
Lorenzo Colitti
93e0ec070a Merge "Fix fd leak in KeepaliveTracker." am: c6a527351f am: 759c08d0f4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1361907

Change-Id: I68dcb3da95c803179733861604e092582eefb254
 2020-08-07 06:02:12 +00:00
Lorenzo Colitti
759c08d0f4 Merge "Fix fd leak in KeepaliveTracker." am: c6a527351f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1361907

Change-Id: I13df61b292a9ec964854641ba170d39caf66125a
 2020-08-07 05:48:00 +00:00
Lorenzo Colitti
c6a527351f Merge "Fix fd leak in KeepaliveTracker." 2020-08-07 05:40:33 +00:00
Chalard Jean
403df8633d Revert "Revert "Move Inet[4]AddressUtils to libs/net"" 
This patch is still needed and should go in now that the
error is fixed.
The patch was submitted into rvc-dev and is already in
rvc-dev-plus-aosp (patch in in ag/11923559, revert
skipped in ag/12072199). A follow-up will remove the
unused services.net-module-wifi target.

Test: originally tested in aosp/1324109
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Change-Id: I1074eedb0b0f156a1135e11210ec102de15ea674
Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
 2020-08-07 03:31:04 +00:00
Josh Gao
bd97cc8ebf Fix fd leak in KeepaliveTracker. 
The semantics of FileDescriptor in AIDL are that the callee must close
the file descriptor it receives manually.

Bug: http://b/157789860
Test: treehugger
Change-Id: Ice9fc9abe2959a84ad138a95c900dff676653665
 2020-08-07 03:22:38 +00:00
Chalard Jean
1b74706c24 Merge "Resolve the endpoint in legacy VPN" am: c0f31b35d0 am: 0317f66f27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382496

Change-Id: If649ab2763c9971c25af7732b32e97bfd50fb6f0
 2020-08-06 16:06:20 +00:00
Chalard Jean
48ac26604f Merge "Add a test for starting the legacy VPN." am: c029c1e928 am: 0cc2c0d906 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372896

Change-Id: Idc49c61cc0547cdabe37cfa19b685c2beeda473b
 2020-08-06 16:06:08 +00:00
Chalard Jean
0317f66f27 Merge "Resolve the endpoint in legacy VPN" am: c0f31b35d0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382496

Change-Id: I732bb2282cf5b4ba74653ecc0bd934bf991649de
 2020-08-06 13:10:36 +00:00