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
|
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 |
|
Remi NGUYEN VAN
|
6a6e3859cf
|
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: Iee4dd439c3f98e600c6a6b1ed6a73384f9a1c2ac
|
2021-05-20 03:35:35 +00:00 |
|
Remi NGUYEN VAN
|
ae18da9ebe
|
Merge "Remove legacy resources fallback from Connectivity" into sc-dev
|
2021-05-20 03:03:16 +00:00 |
|
Les Lee
|
4612627fc4
|
[automerger skipped] Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev am: c95482c53d -s ours am: 76b4c2abeb -s ours am: ed4a75c645 -s ours
am skip reason: Merged-In I7196d62bb60844458a6c4b1d94e2baccb71e15cd with SHA-1 2ef2fa7605 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622495
Change-Id: I7a3bd4bde04b1238f62c1297d3921bd75b300218
|
2021-05-20 02:06:36 +00:00 |
|
Les Lee
|
fdb47cfe0a
|
[automerger skipped] Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev am: c95482c53d am: a43c9ab9f3 -s ours am: ebba55695f -s ours
am skip reason: Merged-In I7196d62bb60844458a6c4b1d94e2baccb71e15cd with SHA-1 79ac43db9e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622495
Change-Id: Icecf6238f2709675f709f3a728fa58d0bf05fff3
|
2021-05-20 02:06:07 +00:00 |
|
Junyu Lai
|
1fc51b9fd0
|
[automerger skipped] Merge changes I3ba50cbd,I970ee365 into sc-dev am: 6ff0bbc3ac -s ours am: 4d35445f7e -s ours am: a797ea252f -s ours
am skip reason: Merged-In I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1 with SHA-1 92aff0d836 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14562500
Change-Id: I2b129f7ba9952a1cfd8aaf5b1e90e2eb858b2b20
|
2021-05-20 01:08:50 +00:00 |
|
Junyu Lai
|
7f9a936717
|
[automerger skipped] Merge changes I3ba50cbd,I970ee365 into sc-dev am: 6ff0bbc3ac am: b4d07a85ad -s ours am: e894e65258 -s ours
am skip reason: Merged-In I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1 with SHA-1 565a3085ce is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14562500
Change-Id: I987e0be8e8bcb2c9e553ac0f3b507aa83f691421
|
2021-05-20 01:07:57 +00:00 |
|
junyulai
|
2960b501d7
|
[automerger skipped] [FUI27] Fix internal naming of notifyNetworkStatus am: eb91ec2684 am: e7ed46dea4 -s ours am: 39e35ca0ce -s ours
am skip reason: Merged-In I970ee365ca221956ee85788005d331374b5fa71a with SHA-1 5eb5fbfce3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14562499
Change-Id: Idfb939d171c9c1570564b1482ec1c7fa67acf35a
|
2021-05-20 01:07:54 +00:00 |
|
Junyu Lai
|
8f585ed854
|
[automerger skipped] Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" into sc-dev am: 7290bf7e2e -s ours am: 0b2fd00acc -s ours am: 3536b973ad -s ours
am skip reason: Merged-In I98dd3f4652dc067eb5c4666e952db6c854bcbb10 with SHA-1 1ebade181e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550548
Change-Id: If8b2ebd6a023387e0433d60f2acd7b7c88eeec55
|
2021-05-20 00:39:13 +00:00 |
|
Junyu Lai
|
1608320755
|
[automerger skipped] Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" into sc-dev am: 7290bf7e2e am: 4a133d34d9 -s ours am: a4a0aa8165 -s ours
am skip reason: Merged-In I98dd3f4652dc067eb5c4666e952db6c854bcbb10 with SHA-1 59177af317 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550548
Change-Id: Iff9a9e4ea239f8f55ea5260e80397835d7aaa7c4
|
2021-05-20 00:39:00 +00:00 |
|
Remi NGUYEN VAN
|
26cb8a3814
|
[automerger skipped] Merge "Move config_apf* resources to NetworkStack" into sc-dev am: 66b0a0361b -s ours am: 498261b15c -s ours am: 82892621e5 -s ours
am skip reason: Merged-In I7a15ddcad5af11fa307d9dbe3a77b31a1179e5b3 with SHA-1 e9836cc431 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622500
Change-Id: Ib637a385aa6f47a9f9b7c7d2f0541c248c49f6a9
|
2021-05-20 00:34:52 +00:00 |
|
Remi NGUYEN VAN
|
f9e039ed44
|
Merge "Move config_apf* resources to NetworkStack" am: c52f4eb2c6 am: 8f0380f066 am: 159c362b21
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684656
Change-Id: Id21289779ef74f33e818e25117bf7a21bb3ecb7a
|
2021-05-20 00:30:27 +00:00 |
|
Nikita Iashchenko
|
d3d97669f3
|
Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework" am: a8eb4abf4d am: a5b968f7ca am: ecf93ebf39
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686657
Change-Id: I9656070d315baffca99c1c545868f66d0c2d54b8
|
2021-05-20 00:23:09 +00:00 |
|
Les Lee
|
866a2c7398
|
Merge "Support to query TYPE_WIFI usage with subscriberId" am: 0c461a4252 am: c890b3cfb5 am: b986c2352b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608057
Change-Id: I8779286b51f34af06d9aad6258f080a12e29088d
|
2021-05-20 00:04:15 +00:00 |
|
Les Lee
|
c0fd0bc89f
|
Merge "Add metered filter for API: buildTemplateCarrier" am: bc5af1fa71 am: 71349734b7 am: 727b2eac5b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699687
Change-Id: I9ed05f9477768acaa0374e5b40da280fdafbbcde
|
2021-05-20 00:03:58 +00:00 |
|
Chiachang Wang
|
cadb1218dd
|
[automerger skipped] Merge "Dump only NORMAL priority information if no priority assigned" into sc-dev am: ad4e3bbd5b -s ours am: 69c73252a6 -s ours
am skip reason: Merged-In I6825c5038e48e3060c0c3ad1512bd584ef6d10a7 with SHA-1 987b73fbe0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14580814
Change-Id: Ic52360d64332fce752ec3e25f9cda88920463eb5
|
2021-05-20 00:02:49 +00:00 |
|
Treehugger Robot
|
6a75e6c7fe
|
Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" am: d5fbc078d1 am: 1587b248cd am: 9493879b31
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705390
Change-Id: I01bed3aa6da1c65f84098339a29bba1f4a09d15b
|
2021-05-20 00:01:31 +00:00 |
|
Lorenzo Colitti
|
66d8c7028c
|
Merge "Allow unprivileged NetworkCallbacks to see other UIDs' networks." into sc-dev am: 846ae25be5 am: 30a5c3cca5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14597477
Change-Id: Icf9516c8f236d6e53f4816c7be67686498d25e4b
|
2021-05-19 23:49:05 +00:00 |
|
Chiachang Wang
|
c460137ac2
|
Merge "Dump only NORMAL priority information if no priority assigned" am: f93d99deae am: 7eaaaf6f1c am: c5b866e672
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708333
Change-Id: Ie16efa923aeae623e36bb900cded04a87699d15e
|
2021-05-19 23:47:43 +00:00 |
|
Aaron Huang
|
847eeb12b1
|
Merge "Add ConnectivityAnnotations class" into sc-dev am: 3610ac6ad1 am: ddf42f822b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14186142
Change-Id: I45df58f58e096f27fa6bb2e1b359c514e68206fe
|
2021-05-19 22:51:15 +00:00 |
|
Paul Hu
|
de804f11da
|
Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" am: accfb247b2 am: 993aaedf1e am: 21860ce119
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689573
Change-Id: Ie76502bc49a20ceafc9ab9a6a448a0b1a178b37a
|
2021-05-19 22:49:34 +00:00 |
|
Paul Hu
|
9bea12fcda
|
Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" am: dec7232c75 am: 6d8b78770a am: 70c7639228
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689572
Change-Id: I6bfca3977345a57da6dc7938911fa3e26ea543e8
|
2021-05-19 22:48:36 +00:00 |
|
Chiachang Wang
|
2749ade0e0
|
[automerger skipped] Merge "Replace clearAll with withoutDefaultCapabilities" am: 98546082cc am: d19bda6e8c -s ours am: 420d77919d -s ours
am skip reason: Merged-In Ida8d25d57504864f046e3403f593cc606fbfe982 with SHA-1 c5c3bfb20e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708330
Change-Id: I4af87b18428e5b063e06e3ae9e5ed70696159f0c
|
2021-05-19 22:47:41 +00:00 |
|
Junyu Lai
|
de07af947a
|
Merge changes I3ba50cbd,I970ee365 am: 260b398281 am: c3fde912c6 am: ae76c2c199
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620859
Change-Id: I9ce9369b30bc568a63321de8764bd49c263b9ea6
|
2021-05-19 22:47:04 +00:00 |
|