TreeHugger Robot
f5b68cda29
Merge "Deprecated UserManager.getUsers(excludeDying) / added getAliveUsers()"
2020-08-26 05:37:22 +00:00
Treehugger Robot
2b9ba207f0
[automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" am: 1e9c48bfec am: a2f81d1442 am: b54db4b9fa -s ours am: 0c3b9562fd -s ours am: e208589695 -s ours
...
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 675f67cbb2 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907
Change-Id: I672c162ac009e773f17c8e98d670dc745c5eca11
2020-08-25 22:04:50 +00:00
Treehugger Robot
e208589695
[automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" am: 1e9c48bfec am: a2f81d1442 am: b54db4b9fa -s ours am: 0c3b9562fd -s ours
...
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 675f67cbb2 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
0c3b9562fd
[automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" am: 1e9c48bfec am: a2f81d1442 am: b54db4b9fa -s ours
...
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 675f67cbb2 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
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
Felipe Leme
72eeb557e7
Deprecated UserManager.getUsers(excludeDying) / added getAliveUsers()
...
The existing method is confusing (the argument used to be called
includeDying) and it puts the burden on the caller (which need to
understand what the parameter means).
Furthermore:
- The majority of calls are for getUsers(excludeDying=true).
- The calls for getUsers(excludeDying=false) are equivalent to
calls to getUsers()
Test: m
Test: a VpnTest ConnectivityServiceTest PermissionMonitorTest
Bug: 157921703
Change-Id: Ife767a40b7b7790ba28b5377046de822ddbf275c
2020-08-24 16:19:26 -07:00
Automerger Merge Worker
e7deeeb241
[automerger skipped] 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 am: 515d8f3c4c -s ours
...
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 675f67cbb2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769
Change-Id: I3dc4e0b8953dd51dea6233af6e71d1921d497b25
2020-08-23 13:56:40 +00:00
TreeHugger Robot
d3eef7e7af
[automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a am: 1b1eff1bc2 am: 9b261be707 -s ours
...
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 ee98d66dea is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769
Change-Id: I2d083962a1a9e8d92008bdb564708d4bc919b6f8
2020-08-23 13:56:04 +00:00
Automerger Merge Worker
515d8f3c4c
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
b3a91b1ce0
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
9b261be707
Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a am: 1b1eff1bc2
...
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
1b1eff1bc2
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
f343f4cb68
Merge "Revert "[RFPM03] Check permission by uid."" am: 0925015de5 am: b2982a0643 am: ab51b37a2b am: d001d445d5 am: d68ba4feaf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654
Change-Id: I3f6108034a4dfcbae9e5d5cf466e924229f33965
2020-08-20 09:48:16 +00:00
Paul Hu
60af908939
Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: bddd412feb am: 9f33dbb509 am: 9ea57d25d8 am: a370cac809 am: 8fa30d7651
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653
Change-Id: Id24e6a79676aebfcc61f9b507ad8fca25b35b424
2020-08-20 09:47:22 +00:00
Paul Hu
d68ba4feaf
Merge "Revert "[RFPM03] Check permission by uid."" am: 0925015de5 am: b2982a0643 am: ab51b37a2b am: d001d445d5
...
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
8fa30d7651
Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: bddd412feb am: 9f33dbb509 am: 9ea57d25d8 am: a370cac809
...
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
d001d445d5
Merge "Revert "[RFPM03] Check permission by uid."" am: 0925015de5 am: b2982a0643 am: ab51b37a2b
...
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
a370cac809
Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: bddd412feb am: 9f33dbb509 am: 9ea57d25d8
...
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
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
892a312be5
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 324af52c7a am: 701cd3908e am: 99653eada1 am: a484db66e9 am: 5a93858eb3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652
Change-Id: I10a4be2a1b88ddcc67d0b3467f9288b9c36f3b18
2020-08-20 08:27:03 +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
5a93858eb3
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 324af52c7a am: 701cd3908e am: 99653eada1 am: a484db66e9
...
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
a484db66e9
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 324af52c7a am: 701cd3908e am: 99653eada1
...
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
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
Junyu Lai
0784a6c992
Merge "Skip RAT type listener registration if IMSI is not available"
2020-08-20 02:20:31 +00:00
junyulai
675f67cbb2
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
junyulai
ee98d66dea
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
Change-Id: I408379b3c432d9e62e0837d6b4f6551cc7838e29
2020-08-19 15:15:51 +08:00
Chalard Jean
991b07f8bc
Merge "Rename Kotlin util files to not include the Kt suffix" am: 6a8da60a32 am: 97cda73a1c am: 97c4e1a647 am: bda6506a01 am: a9b3729c3a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084
Change-Id: I89b50df2ea418f609d4ce7919f3154f54a1379b1
2020-08-13 05:14:14 +00:00
Chalard Jean
a9b3729c3a
Merge "Rename Kotlin util files to not include the Kt suffix" am: 6a8da60a32 am: 97cda73a1c am: 97c4e1a647 am: bda6506a01
...
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
bda6506a01
Merge "Rename Kotlin util files to not include the Kt suffix" am: 6a8da60a32 am: 97cda73a1c am: 97c4e1a647
...
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
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
6c1c1023e3
Merge "Update language to comply with Android's inclusive language guidance" am: 64f9851e3a am: 6afddeb044 am: 148be57009 am: 3db81f877e am: 89e9d75d7d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156
Change-Id: Ib455b42f7f360b75a295f86fd5166125fd0f69aa
2020-08-12 10:58:30 +00:00
Chiachang Wang
89e9d75d7d
Merge "Update language to comply with Android's inclusive language guidance" am: 64f9851e3a am: 6afddeb044 am: 148be57009 am: 3db81f877e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156
Change-Id: I0d9947b6e4591d515a3c318be38e3c46a119a7f7
2020-08-12 10:43:42 +00:00
Chiachang Wang
3db81f877e
Merge "Update language to comply with Android's inclusive language guidance" am: 64f9851e3a am: 6afddeb044 am: 148be57009
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156
Change-Id: Ib078acdf9210f7c80b5cdb50ae5b860aea2a5626
2020-08-12 10:28:50 +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