Commit Graph

10888 Commits

Author SHA1 Message Date
Mark Chien
8041e34fca Merge "Cleanup config_mobile_hotspot_provision_app usage" am: 443092b9a8 am: 4c645dd681 am: ba41c9cef1 am: e80f74f29e am: 2275fe925f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329014

Change-Id: I5af592774f51ddb97b6c926b54ad93b70b7c6836
2020-06-11 08:56:01 +00:00
Mark Chien
2275fe925f Merge "Cleanup config_mobile_hotspot_provision_app usage" am: 443092b9a8 am: 4c645dd681 am: ba41c9cef1 am: e80f74f29e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329014

Change-Id: I8e0fc83e9a3ed7eeb01e7caf761a3b206dc026bd
2020-06-11 08:37:55 +00:00
Mark Chien
e80f74f29e Merge "Cleanup config_mobile_hotspot_provision_app usage" am: 443092b9a8 am: 4c645dd681 am: ba41c9cef1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329014

Change-Id: I46278552c5b9f2cbe251aae7cd007041877dc494
2020-06-11 08:25:19 +00:00
Mark Chien
ba41c9cef1 Merge "Cleanup config_mobile_hotspot_provision_app usage" am: 443092b9a8 am: 4c645dd681
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329014

Change-Id: Ib3bb0129419ffd55df6c2c53cce3ad7e9155e854
2020-06-11 08:03:56 +00:00
Mark Chien
4c645dd681 Merge "Cleanup config_mobile_hotspot_provision_app usage" am: 443092b9a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329014

Change-Id: I3d265ab9806605e18384fa6321452f7c96f3f48b
2020-06-11 07:40:27 +00:00
Automerger Merge Worker
5b3688724c Merge "[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 am: 34d90e3fc7 -s ours" into rvc-d1-dev-plus-aosp am: 567a9ed4de -s ours am: 1fa104463c -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 d4f8954b27 is in history

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

Change-Id: I594adfeb0faf2e4dbad8d69efe1456db36abdfef
2020-06-10 16:20:32 +00:00
Lorenzo Colitti
14128b4ccb [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 -s ours am: 0a059084a0 -s ours am: 9fdb7018d5 -s ours am: fe7601d254 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 d4f8954b27 is in history

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

Change-Id: Id658f9ed7cc293697b9352196b9f6b42f4fbe741
2020-06-10 16:19:21 +00:00
Lorenzo Colitti
c520944dca [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 am: 34d90e3fc7 am: c889bb9a83 -s ours am: fb3f862159 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 c9d788a50c is in history

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

Change-Id: I0bdaab9f4f587a097cbf9e982300981b9d75afcd
2020-06-10 16:08:08 +00:00
Automerger Merge Worker
1fa104463c Merge "[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 am: 34d90e3fc7 -s ours" into rvc-d1-dev-plus-aosp am: 567a9ed4de -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 d4f8954b27 is in history

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

Change-Id: Iac524d19a8a357a3248368a4bfe15ffa668cdb1e
2020-06-10 16:03:24 +00:00
Lorenzo Colitti
fe7601d254 [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 -s ours am: 0a059084a0 -s ours am: 9fdb7018d5 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 d4f8954b27 is in history

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

Change-Id: I24f4975c818a6857feee0082245bfb33af3911ff
2020-06-10 16:01:56 +00:00
Lorenzo Colitti
fb3f862159 [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 am: 34d90e3fc7 am: c889bb9a83 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 c9d788a50c is in history

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

Change-Id: Ib3fb4af9b39f9497b0cbf9cb327cc5941b7dd7ac
2020-06-10 15:55:58 +00:00
markchien
11f729b0b5 Cleanup config_mobile_hotspot_provision_app usage
config_mobile_hotspot_provision_app would be move out of framework and
only private for tethering only.
enforceTetherChangePermission is no longer needed because its only
caller PanService already gate by other privileged permission
(BLUETOOTH_PRIVILEGED).

Bug: 146918263
Test: m

Change-Id: I030871c2bc46bc09c4e52970b4995f98d31bb90e
2020-06-10 15:52:24 +00:00
Automerger Merge Worker
567a9ed4de Merge "[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 am: 34d90e3fc7 -s ours" into rvc-d1-dev-plus-aosp 2020-06-10 15:45:11 +00:00
Lorenzo Colitti
0e42bfcc60 [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 am: 34d90e3fc7 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 c9d788a50c is in history

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

Change-Id: I88b0cfec19209ee77b3d98e67eda1100e13f156a
2020-06-10 15:45:06 +00:00
Lorenzo Colitti
9fdb7018d5 [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 -s ours am: 0a059084a0 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 c9d788a50c is in history

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

Change-Id: I9a58214b06884b92dde316a9c554b9ebcf500604
2020-06-10 15:45:01 +00:00
Lorenzo Colitti
0a059084a0 [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 c9d788a50c is in history

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

Change-Id: Iee50671a7363ed0e820494cbbb06b71063d01f6a
2020-06-10 15:33:04 +00:00
Lorenzo Colitti
34d90e3fc7 Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745979

Change-Id: I7b68541f2cf1b3367b5aa6b6221b636f54c2e53e
2020-06-10 15:32:55 +00:00
Lorenzo Colitti
9d6f1bf413 Merge "Update extra info before registering" into rvc-dev 2020-06-10 15:17:38 +00:00
Xin Li
4c89d0da93 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: a346d8259f -s ours am: 82dfa8f215 -s ours am: 00a6331941 -s ours am: 36755c11bc -s ours am: 018e1106b2 -s ours
am skip reason: Change-Id I5e28537689d1a53e99f91eafd494eb3a0c890f46 with SHA-1 afbf77813b is in history

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

Change-Id: I266f441649d1e28b58c644a640f1059a1bdb5820
2020-06-08 17:25:09 +00:00
Xin Li
018e1106b2 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: a346d8259f -s ours am: 82dfa8f215 -s ours am: 00a6331941 -s ours am: 36755c11bc -s ours
am skip reason: Change-Id I5e28537689d1a53e99f91eafd494eb3a0c890f46 with SHA-1 afbf77813b is in history

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

Change-Id: Id2777f3b97ff4733dfda185b8feceb4cc25330bc
2020-06-08 16:42:05 +00:00
Xin Li
36755c11bc [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: a346d8259f -s ours am: 82dfa8f215 -s ours am: 00a6331941 -s ours
am skip reason: Change-Id I5e28537689d1a53e99f91eafd494eb3a0c890f46 with SHA-1 afbf77813b is in history

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

Change-Id: Ie30658c18424bb30696876b4b4a103fe1c645ab7
2020-06-08 16:29:22 +00:00
Xin Li
00a6331941 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: a346d8259f -s ours am: 82dfa8f215 -s ours
am skip reason: Change-Id I5e28537689d1a53e99f91eafd494eb3a0c890f46 with SHA-1 afbf77813b is in history

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

Change-Id: I3811100a743b62c5a5e9f661647793b719824679
2020-06-08 16:08:03 +00:00
Xin Li
82dfa8f215 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: a346d8259f -s ours
am skip reason: Change-Id I5e28537689d1a53e99f91eafd494eb3a0c890f46 with SHA-1 afbf77813b is in history

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

Change-Id: Iacc1884e345d9df125b3a9bbf32d1d10d3a4757d
2020-06-08 15:56:48 +00:00
TreeHugger Robot
be3d759fb5 [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 -s ours am: 0290fb5b84 -s ours am: a150036ac9 -s ours am: 98c6b0188d -s ours
am skip reason: Change-Id I41bf8a6ddad200f00524d9b2dd1bf169810ee460 with SHA-1 411bb6eb27 is in history

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

Change-Id: I8a1a5cca367f726bc961aa37bb155128e7a9f355
2020-06-08 09:59:30 +00:00
TreeHugger Robot
35e2a17c2e [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 am: 461c086072 -s ours am: 17a6a1cc27 -s ours am: a0003bb89f -s ours
am skip reason: Change-Id I41bf8a6ddad200f00524d9b2dd1bf169810ee460 with SHA-1 d24c4d2f15 is in history

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

Change-Id: Ic2698e8b85ddb572e849e449d3e6a95a44606913
2020-06-08 09:58:56 +00:00
TreeHugger Robot
98c6b0188d [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 -s ours am: 0290fb5b84 -s ours am: a150036ac9 -s ours
am skip reason: Change-Id I41bf8a6ddad200f00524d9b2dd1bf169810ee460 with SHA-1 411bb6eb27 is in history

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

Change-Id: I40411dea60aed25d709c8a992e894a25dcb4247b
2020-06-08 09:39:19 +00:00
TreeHugger Robot
a0003bb89f [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 am: 461c086072 -s ours am: 17a6a1cc27 -s ours
am skip reason: Change-Id I41bf8a6ddad200f00524d9b2dd1bf169810ee460 with SHA-1 d24c4d2f15 is in history

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

Change-Id: Ib6e0fa1ce8201d049ae519ba1272ae84a778f9e9
2020-06-08 09:38:34 +00:00
TreeHugger Robot
a150036ac9 [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 -s ours am: 0290fb5b84 -s ours
am skip reason: Change-Id I41bf8a6ddad200f00524d9b2dd1bf169810ee460 with SHA-1 411bb6eb27 is in history

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

Change-Id: I4421ce9e02b64caefba7704d666dc2edb5f1bd35
2020-06-08 09:24:22 +00:00
TreeHugger Robot
17a6a1cc27 [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 am: 461c086072 -s ours
am skip reason: Change-Id I41bf8a6ddad200f00524d9b2dd1bf169810ee460 with SHA-1 d24c4d2f15 is in history

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

Change-Id: I1f6cbe7a8140a67bc58d8a4fbbf9538700596adf
2020-06-08 09:24:01 +00:00
TreeHugger Robot
0290fb5b84 [automerger skipped] Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099 -s ours
am skip reason: Change-Id I41bf8a6ddad200f00524d9b2dd1bf169810ee460 with SHA-1 d24c4d2f15 is in history

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

Change-Id: I5d2a2bb388181fa798c934dd94bf65df29d13dc3
2020-06-08 09:10:45 +00:00
TreeHugger Robot
461c086072 Merge "Update javadoc to use complete sentence" into rvc-dev am: 1f883f9099
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745980

Change-Id: Ic28db88cac7f13c6355eb9ce76cd8cee660c6c93
2020-06-08 09:10:42 +00:00
Xin Li
a346d8259f Merge "Merge QQ3A.200605.002 into master" 2020-06-06 01:41:11 +00:00
Treehugger Robot
411bb6eb27 Update javadoc to use complete sentence
Avoid using the "iff" abbreviation in our Javadoc.

Bug: 158092978
Test: m doc-comment-check-docs and check the generated doc
Merged-In: I41bf8a6ddad200f00524d9b2dd1bf169810ee460
Change-Id: I41bf8a6ddad200f00524d9b2dd1bf169810ee460
2020-06-05 04:50:14 +00:00
Treehugger Robot
8e8051973c Merge "Update javadoc to use complete sentence" am: 1b33b21814 am: 43299a816e am: 1e926eff19 am: e1d18a0e54 am: f9852aea4e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323953

Change-Id: I558108a3b7f0d33436ee1dbaf6efa9a0ed0a8096
2020-06-05 03:49:26 +00:00
Treehugger Robot
f9852aea4e Merge "Update javadoc to use complete sentence" am: 1b33b21814 am: 43299a816e am: 1e926eff19 am: e1d18a0e54
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323953

Change-Id: Ic42ac7629297947bc6c8bba0c6d29cdb133764fd
2020-06-05 03:39:38 +00:00
Treehugger Robot
e1d18a0e54 Merge "Update javadoc to use complete sentence" am: 1b33b21814 am: 43299a816e am: 1e926eff19
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323953

Change-Id: I47f39a31a066f35a75690ca5ab4827b8d6a89a08
2020-06-05 03:37:22 +00:00
Treehugger Robot
1e926eff19 Merge "Update javadoc to use complete sentence" am: 1b33b21814 am: 43299a816e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323953

Change-Id: I357ae71b7f86ed3560333a67a2444eb8bb93c71c
2020-06-05 03:36:44 +00:00
Treehugger Robot
43299a816e Merge "Update javadoc to use complete sentence" am: 1b33b21814
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323953

Change-Id: I6c8358c81bbc7a08802ef027fcd32adea4821ba0
2020-06-05 03:17:00 +00:00
Treehugger Robot
1b33b21814 Merge "Update javadoc to use complete sentence" 2020-06-05 03:02:36 +00:00
Chiachang Wang
d4f8954b27 Update extra info before registering
The extra info is taken into NetworkMonitor from while creating
it. The NetworkMonitor is created when a new agent is registered
but the extra info is not available at that time. Make sure the
field is set in the NetworkInfo when registering.

Bug: 156173829
Test: adb shell dumpsys network and check the apn in the extra
      info shown correctly
Test: atest FrameworkNetTests
Merged-In: Ieaad8cbf1a28af3b97c7f98f74358e417fcad661
Change-Id: Ieaad8cbf1a28af3b97c7f98f74358e417fcad661
2020-06-05 01:46:06 +00:00
Chiachang Wang
80d8b90c49 Merge "Update extra info before registering" am: 004dde17a5 am: 74c9a25719 am: 9e01256b2d am: 5d5f7c80da am: 53c2132bbf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310538

Change-Id: Idade27520bfda8ca33142c6d2825a504c9cccead
2020-06-05 01:23:59 +00:00
Chiachang Wang
53c2132bbf Merge "Update extra info before registering" am: 004dde17a5 am: 74c9a25719 am: 9e01256b2d am: 5d5f7c80da
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310538

Change-Id: I377a731be6cb95ac001fb0e3f141795662000c9e
2020-06-05 01:11:21 +00:00
Chiachang Wang
5d5f7c80da Merge "Update extra info before registering" am: 004dde17a5 am: 74c9a25719 am: 9e01256b2d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310538

Change-Id: Ied436e6ae963d87cadfd2b1318429e0036fa509f
2020-06-05 00:42:47 +00:00
Chiachang Wang
9e01256b2d Merge "Update extra info before registering" am: 004dde17a5 am: 74c9a25719
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310538

Change-Id: I5e38601026c1f9d30fee58a40bfb1ad467f41e35
2020-06-05 00:41:42 +00:00
Chiachang Wang
74c9a25719 Merge "Update extra info before registering" am: 004dde17a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310538

Change-Id: I6eb786edfe615574c731097df09ae3142e137999
2020-06-05 00:24:09 +00:00
Chiachang Wang
004dde17a5 Merge "Update extra info before registering" 2020-06-05 00:04:04 +00:00
Chiachang Wang
d24c4d2f15 Update javadoc to use complete sentence
Avoid using the "iff" abbreviation in our Javadoc.

Bug: 158092978
Test: m doc-comment-check-docs and check the generated doc
Change-Id: I41bf8a6ddad200f00524d9b2dd1bf169810ee460
2020-06-04 07:46:14 +00:00
Junyu Lai
2d8febc459 [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 -s ours am: ee929416ec -s ours am: 0baad2b5fe -s ours am: cd5479b376 -s ours
am skip reason: Change-Id I04d2b7402f892546722fe6868c521afd9534f183 with SHA-1 7f39b54a36 is in history

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

Change-Id: I51a72cefc4878f275d6e67f0759832a45473ddd8
2020-06-03 07:16:08 +00:00
Junyu Lai
201d8c35b5 [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 am: a21e17ede8 -s ours am: c372c31adb -s ours am: 8f87551abd -s ours
am skip reason: Change-Id I04d2b7402f892546722fe6868c521afd9534f183 with SHA-1 0202567a01 is in history

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

Change-Id: Icfb3785c5fbc2bdc22b9f2614dedabd2b0b7e287
2020-06-03 07:14:10 +00:00
Junyu Lai
cd5479b376 [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 -s ours am: ee929416ec -s ours am: 0baad2b5fe -s ours
am skip reason: Change-Id I04d2b7402f892546722fe6868c521afd9534f183 with SHA-1 7f39b54a36 is in history

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

Change-Id: I658ff5397aa764f672fb3e7ec71293ae2207a768
2020-06-03 07:03:09 +00:00