Aaron Huang
2b4aa6a273
Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 4ca7d588b4 am: a0e48b1df5 am: 2acbd72f5e am: 5e48bf1a25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484
Change-Id: I8a039b0c164e51ed9054d229f52ece259b894b63
2020-06-12 02:35:26 +00:00
Aaron Huang
5e48bf1a25
Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 4ca7d588b4 am: a0e48b1df5 am: 2acbd72f5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484
Change-Id: I643f27dda377ee5d2fa885cac8b814445363a20d
2020-06-12 02:31:29 +00:00
Aaron Huang
a0e48b1df5
Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 4ca7d588b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484
Change-Id: I43328c82223382978ac3475a195011547f6d0fdc
2020-06-12 02:11:58 +00:00
Aaron Huang
4ca7d588b4
Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev
2020-06-12 01:58:59 +00:00
Mark Chien
54e79eca49
[automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d am: a86848082f -s ours am: ce195ed89f -s ours am: 89fbac4319 -s ours
...
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 958263cad9 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092
Change-Id: I4faa099a8bac0d5f846cabe3e82b2a881e43d3ea
2020-06-11 16:22:16 +00:00
Mark Chien
db7f977ad7
[automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d -s ours am: 415e13cd58 -s ours am: 74fa5a8438 -s ours am: 26f3049fee -s ours
...
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 958263cad9 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092
Change-Id: I1eac63f6c0dacab971824ff89bb1a209e4a57cd8
2020-06-11 16:21:02 +00:00
Automerger Merge Worker
680373ce8d
Merge "[automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d am: a86848082f am: 3729872bc5 -s ours" into rvc-qpr-dev-plus-aosp am: 977f3f877f -s ours
...
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 11f729b0b5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092
Change-Id: I6257a57b332e047f15b84f2c7068e9a915914462
2020-06-11 16:20:41 +00:00
Mark Chien
89fbac4319
[automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d am: a86848082f -s ours am: ce195ed89f -s ours
...
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 958263cad9 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092
Change-Id: I62feefafdce8f21594d4578da32921ac280524a8
2020-06-11 15:58:53 +00:00
Mark Chien
26f3049fee
[automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d -s ours am: 415e13cd58 -s ours am: 74fa5a8438 -s ours
...
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 11f729b0b5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092
Change-Id: I6ef41c6a4fb65d1143f575c93669d6cf536f5fac
2020-06-11 15:58:01 +00:00
Mark Chien
61ccd6b6bf
[automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d am: a86848082f am: 3729872bc5 -s ours
...
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 11f729b0b5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092
Change-Id: I430112862f94c37182e0224d5c0db71fadfcc240
2020-06-11 15:57:52 +00:00
Mark Chien
ce195ed89f
[automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d am: a86848082f -s ours
...
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 958263cad9 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092
Change-Id: I9d40c0e0998d238bcde75a1417f1dbac384285d7
2020-06-11 15:45:34 +00:00
Mark Chien
74fa5a8438
[automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d -s ours am: 415e13cd58 -s ours
...
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 11f729b0b5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092
Change-Id: Ib9adc3d5bff3f75a2472ecef958a66d582fd9a97
2020-06-11 15:43:01 +00:00
Mark Chien
a86848082f
Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092
Change-Id: Iece352be0190b902c4949c1feb76281653a9b59f
2020-06-11 15:42:41 +00:00
Mark Chien
415e13cd58
[automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d -s ours
...
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 11f729b0b5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092
Change-Id: I03e5cf0b7950726825c781dda3b5efdc613e2dcf
2020-06-11 15:42:35 +00:00
Chalard Jean
04ab388705
Merge "Document the limitation to a hundred callbacks." am: 665d54db52 am: 1baaf76e55 am: 8534af7ed5 am: 06ee0240a7 am: ca741d1383
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813
Change-Id: Ib2be38ce56ad3097ad1a54f320b73f44c075bbc7
2020-06-11 13:52:48 +00:00
Chalard Jean
ca741d1383
Merge "Document the limitation to a hundred callbacks." am: 665d54db52 am: 1baaf76e55 am: 8534af7ed5 am: 06ee0240a7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813
Change-Id: Iaff59cefc60948deb30b3a27ee16301b5aa30dcc
2020-06-11 13:36:54 +00:00
markchien
958263cad9
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
Merged-In: I030871c2bc46bc09c4e52970b4995f98d31bb90e
2020-06-11 13:32:12 +00:00
Chalard Jean
06ee0240a7
Merge "Document the limitation to a hundred callbacks." am: 665d54db52 am: 1baaf76e55 am: 8534af7ed5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813
Change-Id: Ie9f8c65c307cbefb6e95ec0d3099e5da875ff1c2
2020-06-11 13:16:54 +00:00
Chalard Jean
8534af7ed5
Merge "Document the limitation to a hundred callbacks." am: 665d54db52 am: 1baaf76e55
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813
Change-Id: I84b1e39503feddc914b61d4e8bd35953e92ac270
2020-06-11 13:03:37 +00:00
Chalard Jean
1baaf76e55
Merge "Document the limitation to a hundred callbacks." am: 665d54db52
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813
Change-Id: Id2f70609c46ec6252b7e734c1e5838016314400f
2020-06-11 12:46:15 +00:00
Chalard Jean
665d54db52
Merge "Document the limitation to a hundred callbacks."
2020-06-11 12:31:09 +00:00
Chalard Jean
7f06b34acd
Document the limitation to a hundred callbacks.
...
Some developers have been surprised by this limitation and had trouble
figuring out what the issue was. Add documentation to address this.
This also includes a drive-by removal of a duplicate check.
Bug: 149867479
Test: doc-only change
Change-Id: I5911d01984695550b6c9afe7a8eb535bf5e320a1
2020-06-11 12:30:21 +00:00
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
Aaron Huang
f0ada3725f
Add unit test for NetworkStatsSubscriptionsMonitor
...
Bug: 154080205
Test: atest FrameworksNetTests:com.android.server.net.NetworkStatsSubscriptionsMonitorTest
Change-Id: I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91
2020-06-09 00:40:36 +08: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