Commit Graph

15643 Commits

Author SHA1 Message Date
Treehugger Robot
235dd87ecf Merge "Use CS identity to update setting while performing factory reset" am: 84e3b0d051 am: 3cf418cc1d am: d4ca569ea6 am: ff595fbe27
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695309

Change-Id: I52688f826a5d532a4932853e36f0b26471a372c4
2021-05-21 02:42:59 +00:00
Treehugger Robot
ff595fbe27 Merge "Use CS identity to update setting while performing factory reset" am: 84e3b0d051 am: 3cf418cc1d am: d4ca569ea6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695309

Change-Id: I97ea36e551d4445475e8edce1a752d380fd03bee
2021-05-21 02:26:17 +00:00
Treehugger Robot
d4ca569ea6 Merge "Use CS identity to update setting while performing factory reset" am: 84e3b0d051 am: 3cf418cc1d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695309

Change-Id: I7c23d33349e7f28a6fc17f5191e973f60e1eb96d
2021-05-21 02:08:51 +00:00
Treehugger Robot
3cf418cc1d Merge "Use CS identity to update setting while performing factory reset" am: 84e3b0d051
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695309

Change-Id: Ifce6312c750c738a4e4afb93f39522b4a282ae4a
2021-05-21 01:44:13 +00:00
Treehugger Robot
84e3b0d051 Merge "Use CS identity to update setting while performing factory reset" 2021-05-21 01:26:05 +00:00
Cody Kesting
23e37e6c76 Merge "Check location permission for ConnDiags last." am: 9f74e660cf am: 8518a87189 am: a664fbab16 am: 99a8674724
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699069

Change-Id: I1664fd4cb4d5d896e9add62fc3fcc4214e1de0d7
2021-05-20 22:57:07 +00:00
Cody Kesting
99a8674724 Merge "Check location permission for ConnDiags last." am: 9f74e660cf am: 8518a87189 am: a664fbab16
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699069

Change-Id: I7751b1327f63aa49cdf413b3c1b03555551381bf
2021-05-20 22:36:11 +00:00
Cody Kesting
a664fbab16 Merge "Check location permission for ConnDiags last." am: 9f74e660cf am: 8518a87189
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699069

Change-Id: I6ca0b27d9280e9246fbf6ea105f18d6f1d073388
2021-05-20 22:18:05 +00:00
Cody Kesting
8518a87189 Merge "Check location permission for ConnDiags last." am: 9f74e660cf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699069

Change-Id: Idfea26523ff297f8be22695dd5a4e5351a7ccda4
2021-05-20 21:46:19 +00:00
Cody Kesting
9f74e660cf Merge "Check location permission for ConnDiags last." 2021-05-20 21:27:46 +00:00
TreeHugger Robot
7e8cb14bb5 Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev am: 8276072ec9 am: ef8554f335 am: 9b7784a154
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640282

Change-Id: Ie01a060c2534db8c27d88f38ef1a4af357a6edf3
2021-05-20 17:25:32 +00:00
TreeHugger Robot
e9e1035244 Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev am: 8276072ec9 am: b0c0b5deab am: 065852c749
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640282

Change-Id: I3d09c58b8fff20136b929fe9f565f01cfc1ee9f5
2021-05-20 17:23:58 +00:00
TreeHugger Robot
9b7784a154 Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev am: 8276072ec9 am: ef8554f335
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640282

Change-Id: I3a6c01a5879910bb7e323d146d097f94e6d521a6
2021-05-20 17:13:55 +00:00
TreeHugger Robot
065852c749 Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev am: 8276072ec9 am: b0c0b5deab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640282

Change-Id: I738f01bf04af315b5c3bb4b4950b3a25a4e96c32
2021-05-20 17:08:20 +00:00
TreeHugger Robot
ef8554f335 Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev am: 8276072ec9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640282

Change-Id: I578b566c5b73e06b9f675cbde6954dccbc0a5a57
2021-05-20 16:45:48 +00:00
TreeHugger Robot
b0c0b5deab Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev am: 8276072ec9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640282

Change-Id: I4e3842ae2fa38b3979171ab0b48a94867040a876
2021-05-20 16:45:36 +00:00
TreeHugger Robot
8276072ec9 Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev 2021-05-20 16:32:19 +00:00
Les Lee
1e35309f9c [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 97385fe60d am: a96e197bb6 -s ours am: 317cb30668 -s ours
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 e650c5d898 is already in history

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

Change-Id: Ide5281e495d5462c2b9316232216cf00d6075c7d
2021-05-20 09:23:54 +00:00
Paul Hu
fd17b8b896 [automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: 92357d0683 am: d8ab25b0d1 -s ours am: 4d58beff20 -s ours
am skip reason: Merged-In I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520 with SHA-1 aacdca1227 is already in history

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

Change-Id: I45cd79563f66e5d137234dca42ba70a68da3383d
2021-05-20 09:23:45 +00:00
Les Lee
acc58e430e [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 97385fe60d -s ours am: 4b84bc4feb -s ours am: df13ccb4ad -s ours
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 645be7b586 is already in history

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

Change-Id: I4b3c6babeb8838e90652a6542d093b8ddae0ddc3
2021-05-20 09:23:37 +00:00
Paul Hu
e9a9a2443c [automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: 92357d0683 -s ours am: 86d9827212 -s ours am: 5927b2d4ab -s ours
am skip reason: Merged-In I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520 with SHA-1 0d9553a5c1 is already in history

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

Change-Id: I8fc4c3ca54151e00ffa91944328456c9e88fc7a5
2021-05-20 09:23:24 +00:00
Les Lee
317cb30668 [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 97385fe60d am: a96e197bb6 -s ours
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 e650c5d898 is already in history

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

Change-Id: Ia29b8d3dd8131762bcbbb7e8e075e2fe3d3bbbe9
2021-05-20 09:15:47 +00:00
Paul Hu
4d58beff20 [automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: 92357d0683 am: d8ab25b0d1 -s ours
am skip reason: Merged-In I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520 with SHA-1 aacdca1227 is already in history

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

Change-Id: Iecfef7bbe38e118e52f53de07d653ec5497b0b56
2021-05-20 09:15:39 +00:00
Les Lee
a96e197bb6 Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 97385fe60d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622496

Change-Id: Ic4c5fc6e7fa3b78e52c529b597ca36a5390472e2
2021-05-20 09:11:41 +00:00
Paul Hu
d8ab25b0d1 Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: 92357d0683
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622493

Change-Id: Ie9e62c30eea19718b96314b9f4bb4def8e9110c2
2021-05-20 09:10:47 +00:00
Les Lee
df13ccb4ad [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 97385fe60d -s ours am: 4b84bc4feb -s ours
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 645be7b586 is already in history

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

Change-Id: I2a22974515aa4a66cdc7a479540276c823acb30b
2021-05-20 09:10:18 +00:00
Paul Hu
5927b2d4ab [automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: 92357d0683 -s ours am: 86d9827212 -s ours
am skip reason: Merged-In I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520 with SHA-1 0d9553a5c1 is already in history

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

Change-Id: Ia7084a9812ecb1686a83237a375bd09aeb1176cf
2021-05-20 09:10:10 +00:00
Les Lee
4b84bc4feb [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 97385fe60d -s ours
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 645be7b586 is already in history

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

Change-Id: If1a3eeb5077d7b078a3be260e01c4cf3f6790437
2021-05-20 09:06:38 +00:00
Paul Hu
86d9827212 [automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: 92357d0683 -s ours
am skip reason: Merged-In I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520 with SHA-1 0d9553a5c1 is already in history

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

Change-Id: I2b1a734003cf71be772550bfef68f3c057d1f22f
2021-05-20 09:06:24 +00:00
Les Lee
97385fe60d Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev 2021-05-20 08:55:59 +00:00
Paul Hu
92357d0683 Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev 2021-05-20 08:45:35 +00:00
Paul Hu
51d73a841d [automerger skipped] Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: be72086fff -s ours am: 2019dcef2e -s ours am: a893b4e9b9 -s ours
am skip reason: Merged-In I856b545c0339a262abbe9d432cfda125bc82dc12 with SHA-1 8ee4d96282 is already in history

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

Change-Id: I9aac6918c0c4ab139021c063212888f048c8a783
2021-05-20 06:38:38 +00:00
Paul Hu
d0ec5fa767 [automerger skipped] Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: be72086fff am: 1e7021ef40 -s ours am: c1482d200c -s ours
am skip reason: Merged-In I856b545c0339a262abbe9d432cfda125bc82dc12 with SHA-1 5d847b19cd is already in history

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

Change-Id: I9463d961c02eed29feb4170fcc6fddb632e0dd18
2021-05-20 06:37:47 +00:00
Paul Hu
a893b4e9b9 [automerger skipped] Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: be72086fff -s ours am: 2019dcef2e -s ours
am skip reason: Merged-In I856b545c0339a262abbe9d432cfda125bc82dc12 with SHA-1 8ee4d96282 is already in history

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

Change-Id: I749d7beefd63cd99538ddd61f8abff52d7704323
2021-05-20 06:20:51 +00:00
Paul Hu
c1482d200c [automerger skipped] Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: be72086fff am: 1e7021ef40 -s ours
am skip reason: Merged-In I856b545c0339a262abbe9d432cfda125bc82dc12 with SHA-1 5d847b19cd is already in history

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

Change-Id: I0dad8c143355a20370b36fc06e9bc6a12f4a858c
2021-05-20 06:18:39 +00:00
Paul Hu
1e7021ef40 Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: be72086fff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622492

Change-Id: I5a402f666c66f19e849b3bf2e1a7034cbfd97734
2021-05-20 06:04:22 +00:00
Paul Hu
2019dcef2e [automerger skipped] Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: be72086fff -s ours
am skip reason: Merged-In I856b545c0339a262abbe9d432cfda125bc82dc12 with SHA-1 5d847b19cd is already in history

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

Change-Id: Idd31246804a7374929545c7a4c021058a33a9758
2021-05-20 06:02:38 +00:00
Paul Hu
be72086fff Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev 2021-05-20 05:57:25 +00:00
TreeHugger Robot
e3a256cd6e Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev am: a99476773f am: 3c1aac187d am: 2f962fac5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601670

Change-Id: I794a66047f5db6b33398d20009375868366b07a4
2021-05-20 05:28:38 +00:00
Remi NGUYEN VAN
2b1e46c694 Merge "Remove legacy resources fallback from Connectivity" into sc-dev am: ae18da9ebe am: 6a6e3859cf am: fa32cb1413
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622504

Change-Id: I254c6c0410ace2e36c8aaf70956a012a4848df8f
2021-05-20 05:28:21 +00:00
TreeHugger Robot
682d33202c Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev am: a99476773f am: 74dddbeb82 am: 9cb6d7475b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601670

Change-Id: I800e9ceb40156cc4f96d6a4feebfd621cdc46078
2021-05-20 05:27:47 +00:00
Remi NGUYEN VAN
3ebb42fa83 Merge "Remove legacy resources fallback from Connectivity" into sc-dev am: ae18da9ebe am: 870fe3915d am: db0456ce73
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622504

Change-Id: I94eb5600dd70fb6f28926f161b7d8d1973acfa5c
2021-05-20 05:27:30 +00:00
TreeHugger Robot
2f962fac5e Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev am: a99476773f am: 3c1aac187d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601670

Change-Id: Ieefbf729ec7cca3264a5f77434ea62955d878825
2021-05-20 04:48:44 +00:00
Remi NGUYEN VAN
fa32cb1413 Merge "Remove legacy resources fallback from Connectivity" into sc-dev am: ae18da9ebe am: 6a6e3859cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622504

Change-Id: Ifcae8b0e5ef093563e27948db6e6308a9be084a1
2021-05-20 04:47:55 +00:00
TreeHugger Robot
9cb6d7475b Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev am: a99476773f am: 74dddbeb82
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601670

Change-Id: Ib3d94471163139f281eaeff5cc67716eaffea593
2021-05-20 04:31:14 +00:00
TreeHugger Robot
74dddbeb82 Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev am: a99476773f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601670

Change-Id: Ieb5a7a764a5b7fc327af0aeda0c2db51b6e6187c
2021-05-20 04:23:26 +00:00
TreeHugger Robot
3c1aac187d Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev am: a99476773f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601670

Change-Id: Ib259c6351471aca6656dc4d46bb7242228a226c2
2021-05-20 04:21:42 +00:00
Remi NGUYEN VAN
db0456ce73 Merge "Remove legacy resources fallback from Connectivity" into sc-dev am: ae18da9ebe am: 870fe3915d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622504

Change-Id: Ib7c4c68edfbb089f34a7679c2f58402fc8a816be
2021-05-20 04:21:41 +00:00
TreeHugger Robot
a99476773f Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev 2021-05-20 03:59:55 +00:00
Remi NGUYEN VAN
870fe3915d Merge "Remove legacy resources fallback from Connectivity" into sc-dev am: ae18da9ebe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622504

Change-Id: I016f899a96b5499260b809fa999b5138d5982a72
2021-05-20 03:38:08 +00:00