LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,601 Commits 2 Branches 0 Tags
04a34b647d8196e78af89e5554ba1504f4a86e7c
Commit Graph

11601 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
4ceb112bf5 [automerger skipped] Merge RP1A.200720.011 am: 37db1eb217 -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
2ae757b448 [automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours am: 16d097df62 -s ours am: 01022c287d -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: I6e8a2040ecfef8ba0e28807c2f753d68afa32155
 2020-09-02 20:33:01 +00:00
Xin Li
01022c287d [automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours am: 16d097df62 -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: Ibe18c1e4bb2fffb65add10a48b8a72fde60a2e2b
 2020-09-02 19:37:31 +00:00
Xin Li
37db1eb217 Merge RP1A.200720.011 
Bug: 167588565
Merged-In: Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c
Change-Id: Ia8f5f008bc1f77115b644ab996aedc892fab68e7
 2020-09-02 12:34:37 -07:00
Xin Li
16d097df62 [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
6d805206fa Mark RP1A.200720.001 as merged 
Bug: 167588565
Merged-In: I608df7327b8366fd365b11c6bdff9ed28fde99b0
Change-Id: Ie293ab2bcba5f778a7cac8476e226dc7c15e000f
 2020-09-02 11:44:54 -07:00
Xin Li
92ee9d42f3 [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: 1e8c59b9c1 -s ours am: 5b0f466e5e -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: Ibf18c18a55f917c4bbdccd1e088a5ec808573ea7
 2020-09-01 22:09:55 +00:00
Xin Li
5b0f466e5e [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: 1e8c59b9c1 -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: Icebcb9092d11694141d0d6a0c47c9f8378f5b03a
 2020-09-01 21:46:39 +00:00
Xin Li
1e8c59b9c1 [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
4afc1e6669 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
9689dd5ea5 Merge "Notify the keepalive is stopped after the slot has been released" am: c4aaac8af6 am: b5e1feccbe am: d85c0d27b9 am: fbaebd99db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1112851

Change-Id: Ife8e4083142313916660cde2b460e3683f244350
 2020-08-28 11:57:25 +00:00
Junyu Lai
fbaebd99db Merge "Notify the keepalive is stopped after the slot has been released" am: c4aaac8af6 am: b5e1feccbe am: d85c0d27b9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1112851

Change-Id: I846ad59dba08f17a01700378a2cdbb931629b283
 2020-08-28 11:45:51 +00:00
Junyu Lai
d85c0d27b9 Merge "Notify the keepalive is stopped after the slot has been released" am: c4aaac8af6 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
c4aaac8af6 Merge "Notify the keepalive is stopped after the slot has been released" 2020-08-28 10:12:44 +00:00
Treehugger Robot
793346a094 [automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" am: 7d9554c8c0 am: e26f9b879f am: 0086f5d657 -s ours am: afb0cba3c9 -s ours 
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 a57040886b is in history

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

Change-Id: Ifba95c25fab6decc52b78cc92c95b100d5066fb6
 2020-08-25 21:33:59 +00:00
Treehugger Robot
afb0cba3c9 [automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" am: 7d9554c8c0 am: e26f9b879f am: 0086f5d657 -s ours 
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 a57040886b is in history

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

Change-Id: Iff9fe875b4e12d837e5fe52f956ff0f13d3c6ce3
 2020-08-25 21:09:22 +00:00
Treehugger Robot
0086f5d657 Merge "Skip RAT type listener registration if IMSI is not available" am: 7d9554c8c0 am: e26f9b879f 
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
e26f9b879f Merge "Skip RAT type listener registration if IMSI is not available" am: 7d9554c8c0 
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
7d9554c8c0 Merge "Skip RAT type listener registration if IMSI is not available" 2020-08-25 19:55:09 +00:00
junyulai
f91b0237fe 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
Automerger Merge Worker
8ac676636a Merge "Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a am: d74c016c09" into rvc-qpr-dev-plus-aosp 2020-08-23 13:42:14 +00:00
TreeHugger Robot
a32768741a Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a am: d74c016c09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769

Change-Id: I0c3658f86f2d359778f63d3dfe4e682708ddbb71
 2020-08-23 13:41:55 +00:00
TreeHugger Robot
c579631da4 Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a am: 5e1bb74182 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769

Change-Id: I8e6777e87c50699977316d88478f230fce494c42
 2020-08-23 13:41:47 +00:00
TreeHugger Robot
5e1bb74182 Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769

Change-Id: Ia10dc546e107e9c1fc249766c2bcfc5856ce1bd2
 2020-08-23 13:18:49 +00:00
Paul Hu
ee55c387bc Merge "Revert "[RFPM03] Check permission by uid."" am: fc98e38215 am: f8f45a92f5 am: 076c52d527 am: 33bcd99251 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654

Change-Id: I8913969ddf7480ad498631db05c9bc84e1d0396a
 2020-08-20 09:19:40 +00:00
Paul Hu
7bfc16bec4 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: c45d2d3848 am: d22d125329 am: c4f3e10244 am: 80c6509476 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653

Change-Id: I123a821f1b121f4ea11dc2a1cb71bf88de409797
 2020-08-20 09:19:14 +00:00
Paul Hu
33bcd99251 Merge "Revert "[RFPM03] Check permission by uid."" am: fc98e38215 am: f8f45a92f5 am: 076c52d527 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654

Change-Id: Ie7ac76d52a1bc8e58fc660a86a5f30ab7f2a25b4
 2020-08-20 09:06:22 +00:00
Paul Hu
80c6509476 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: c45d2d3848 am: d22d125329 am: c4f3e10244 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653

Change-Id: I159f2052d27ad2c923c4463f161fbb3358eb1bb2
 2020-08-20 09:05:53 +00:00
Paul Hu
076c52d527 Merge "Revert "[RFPM03] Check permission by uid."" am: fc98e38215 am: f8f45a92f5 
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
c4f3e10244 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: c45d2d3848 am: d22d125329 
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
f8f45a92f5 Merge "Revert "[RFPM03] Check permission by uid."" am: fc98e38215 
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
d22d125329 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: c45d2d3848 
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
fc98e38215 Merge "Revert "[RFPM03] Check permission by uid."" 2020-08-20 08:24:30 +00:00
Paul Hu
c45d2d3848 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" 2020-08-20 08:14:48 +00:00
Paul Hu
46ccb1743f Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 07c54c9804 am: 6a6253cddd am: 298e83c281 am: c6ac338a20 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652

Change-Id: I146f4ec57303570d7dc37716882075701d7f32d1
 2020-08-20 07:58:15 +00:00
Paul Hu
c6ac338a20 Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 07c54c9804 am: 6a6253cddd am: 298e83c281 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652

Change-Id: I148fd645e30d866073a883550628f4013569af3c
 2020-08-20 07:45:15 +00:00
Paul Hu
298e83c281 Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 07c54c9804 am: 6a6253cddd 
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
6a6253cddd Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 07c54c9804 
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
07c54c9804 Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" 2020-08-20 06:25:06 +00:00
Paul Hu
9c60af3743 Revert "[RFPM03] Check permission by uid." 
This reverts commit 8adb39a688.

Reason for revert: Regression in SW.  Bug:162499840

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

Reason for revert: Regression in SW.  Bug:162499840

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

Reason for revert: Regression in SW.  Bug:162499840

Change-Id: I0e846efcc4fc06b53d97b2007e0d8e8f97c6ac10
 2020-08-20 03:10:08 +00:00
junyulai
75125f2131 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
junyulai
a57040886b 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-19 09:53:20 +00:00
Chalard Jean
150edd2987 Merge "Rename Kotlin util files to not include the Kt suffix" am: 9f2f0ce903 am: 05784f0a5a am: 9be3ecf9b3 am: af253ce94a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I69da39a99014256dd1188cb522e8d0900deb66d1
 2020-08-13 04:57:30 +00:00
Chalard Jean
af253ce94a Merge "Rename Kotlin util files to not include the Kt suffix" am: 9f2f0ce903 am: 05784f0a5a am: 9be3ecf9b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I6d7b924f9c0e8722400611cec31b4bf4222548ad
 2020-08-13 04:43:45 +00:00
Chalard Jean
9be3ecf9b3 Merge "Rename Kotlin util files to not include the Kt suffix" am: 9f2f0ce903 am: 05784f0a5a 
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
05784f0a5a Merge "Rename Kotlin util files to not include the Kt suffix" am: 9f2f0ce903 
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
9f2f0ce903 Merge "Rename Kotlin util files to not include the Kt suffix" 2020-08-13 03:52:47 +00:00
Chiachang Wang
0375537cf0 Merge "Update language to comply with Android's inclusive language guidance" am: e559544470 am: bafca91de9 am: f8ceddc7ca am: e0a40cdf0c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: I0d9947b6e4591d515a3c318be38e3c46a119a7f7
 2020-08-12 10:43:42 +00:00