Lorenzo Colitti
c3b003da37
Merge "Ensure all calls to getCallingUid use the version in mDeps." am: a6b1b9d110 am: 18e2734d2f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635320
Change-Id: Ib427fa0d6d9b2ecf35e820db9eb1dc762a81bb3a
2021-03-19 09:01:55 +00:00
Lorenzo Colitti
18e2734d2f
Merge "Ensure all calls to getCallingUid use the version in mDeps." am: a6b1b9d110
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635320
Change-Id: I6719b51b78ace57bc36f4dba738c0c420947a8bf
2021-03-19 08:24:59 +00:00
Lorenzo Colitti
a6b1b9d110
Merge "Ensure all calls to getCallingUid use the version in mDeps."
2021-03-19 07:36:52 +00:00
Chalard Jean
ff706470e9
Merge "[NS02] Mix in validation of the score" am: a5323dd580 am: 211f271ce4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556100
Change-Id: I9f628ce479db20f26a1ea1549ab11635613ccfa9
2021-03-19 06:44:12 +00:00
Chalard Jean
211f271ce4
Merge "[NS02] Mix in validation of the score" am: a5323dd580
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556100
Change-Id: I229c3033a16d6b7f11f1b3f02351cc0d2153d199
2021-03-19 06:05:28 +00:00
Chalard Jean
a5323dd580
Merge "[NS02] Mix in validation of the score"
2021-03-19 05:39:40 +00:00
Treehugger Robot
9f4d989074
Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" am: f678876c62 am: cbb8786faf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640985
Change-Id: I5c04566c379e2cad164d55050ffdc9152432dfd3
2021-03-19 05:27:46 +00:00
Chalard Jean
6bde0e5c04
[NS02] Mix in validation of the score
...
Test: FrameworksNetTests FrameworksWifiTests NetworkStackTests
Change-Id: I9cac3a05ad0c4008599973b12d2c5e4c02233a5c
2021-03-19 13:50:56 +09:00
Treehugger Robot
cbb8786faf
Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" am: f678876c62
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640985
Change-Id: I26db95ad9d91dec40a62b7e4c4c0b77133ddb5d3
2021-03-19 04:42:53 +00:00
Treehugger Robot
f678876c62
Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API"
2021-03-19 04:13:36 +00:00
Remi NGUYEN VAN
9bdd98e71d
Merge "Add InetAddressCompat" am: e1da163302 am: 2aec625379
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645289
Change-Id: I94fef501699aa01c997a03dd24a5a25442075af1
2021-03-19 01:10:06 +00:00
Remi NGUYEN VAN
b4525057e5
Merge "Move network selection utils to Connectivity" am: f0f68f5561 am: b1155aa195
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645291
Change-Id: Ia276fc1988baf3240f120682170d6c41ee01839e
2021-03-19 01:09:30 +00:00
Remi NGUYEN VAN
2aec625379
Merge "Add InetAddressCompat" am: e1da163302
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645289
Change-Id: I6946ca309ae923a637f5e5f0ad73c91b26b3c376
2021-03-19 00:39:34 +00:00
Remi NGUYEN VAN
b1155aa195
Merge "Move network selection utils to Connectivity" am: f0f68f5561
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645291
Change-Id: I452591707a97b501f189fa9f61e90da842fa3734
2021-03-19 00:35:03 +00:00
Remi NGUYEN VAN
e1da163302
Merge "Add InetAddressCompat"
2021-03-18 23:58:16 +00:00
Remi NGUYEN VAN
f0f68f5561
Merge "Move network selection utils to Connectivity"
2021-03-18 23:57:34 +00:00
Anthony Stange
0a45e2c173
[automerger skipped] Merge "Revert "Add an API to listen for changes in network blocked status of an uid."" am: 2bb1da3473 -s ours am: 00a2a4c7ce -s ours
...
am skip reason: skip tag Change-Id Ib9949b8619c6b148f73630b314c4113d76c31ec1 with SHA-1 cc8f26dea8 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645826
Change-Id: If86357ec4e47c2de55377d84a44738f341d220bc
2021-03-18 17:26:47 +00:00
Anthony Stange
a2c19b719d
Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE" am: 2576238aec am: 37cb1551a0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645768
Change-Id: Ic7f04ad2af282654f5a57c9e25e8dad9b78f114c
2021-03-18 17:26:18 +00:00
Sudheer Shanka
0a57ff459d
Merge "Add an API to listen for changes in network blocked status of an uid." am: c262455617 am: 5580953ba4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612823
Change-Id: I5f64c0872ba298e8b7a10f5a4348c35ff19a9bb5
2021-03-18 17:25:15 +00:00
Anthony Stange
00a2a4c7ce
[automerger skipped] Merge "Revert "Add an API to listen for changes in network blocked status of an uid."" am: 2bb1da3473 -s ours
...
am skip reason: skip tag Change-Id Ib9949b8619c6b148f73630b314c4113d76c31ec1 with SHA-1 cc8f26dea8 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645826
Change-Id: Ib47f1d63ab15abf1ad8aba79f6f2922abf959010
2021-03-18 17:11:21 +00:00
Anthony Stange
37cb1551a0
Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE" am: 2576238aec
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645768
Change-Id: I311d4e3e5718afbe7d9817a4c85040d8afe5d66d
2021-03-18 17:02:59 +00:00
Anthony Stange
2bb1da3473
Merge "Revert "Add an API to listen for changes in network blocked status of an uid.""
2021-03-18 16:52:08 +00:00
Anthony Stange
d88174dafd
Revert "Add an API to listen for changes in network blocked status of an uid."
...
This reverts commit cc8f26dea8 .
Reason for revert: Breaking build - b/183106805
Bug: 183106805
Merged-In: Ib9949b8619c6b148f73630b314c4113d76c31ec1
Change-Id: I9789ed81e630f49c71034b6917188983bd11d774
2021-03-18 16:51:22 +00:00
Anthony Stange
2576238aec
Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE"
...
* changes:
Revert "Replace the usage of UidRange"
Revert "Expose uids related APIs in NetworkRequest and NetworkCa..."
2021-03-18 16:40:53 +00:00
Anthony Stange
f0b9889ccf
Revert "Replace the usage of UidRange"
...
Revert "Add shims for NetworkRequest"
Revert submission 1626206-replaceUidRange
Reason for revert: Breaking build - b/183106405
Reverted Changes:
I0b79c73e8:Add shims for NetworkRequest
I4bc0daf5a:Replace the usage of UidRange
I4e5aec6ef:Replace the usage of UidRange
I107c329d4:Expose uids related APIs in NetworkRequest and Net...
Change-Id: I6290429db1c8e787f8138b55b98fd92a74ac6402
2021-03-18 16:30:59 +00:00
Anthony Stange
84d92b3ce1
Revert "Expose uids related APIs in NetworkRequest and NetworkCa..."
...
Revert "Add shims for NetworkRequest"
Revert submission 1626206-replaceUidRange
Reason for revert: Breaking build - b/183106405
Reverted Changes:
I0b79c73e8:Add shims for NetworkRequest
I4bc0daf5a:Replace the usage of UidRange
I4e5aec6ef:Replace the usage of UidRange
I107c329d4:Expose uids related APIs in NetworkRequest and Net...
Change-Id: I45e08f89533af0d6851add38fecb5c6c114615ae
2021-03-18 16:30:59 +00:00
Sudheer Shanka
5580953ba4
Merge "Add an API to listen for changes in network blocked status of an uid." am: c262455617
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612823
Change-Id: Iff60405d8f925d0a95ea4bf3230da38ce822c9f2
2021-03-18 16:09:58 +00:00
Sudheer Shanka
c262455617
Merge "Add an API to listen for changes in network blocked status of an uid."
2021-03-18 15:29:17 +00:00
Remi NGUYEN VAN
65b24f7034
Move network selection utils to Connectivity
...
NetworkScore, IOnCompleteListener should be in the Connectivity scope,
as they are supporting classes for the ConnectivityManager APIs.
Bug: 181512874
Test: m
Change-Id: I6dc40a80e0bf5f86f5625b657b01eba969d41fcf
2021-03-18 23:57:26 +09:00
Remi NGUYEN VAN
33e3abb3b5
Add InetAddressCompat
...
Although the InetAddress symbols used by Connectivity are stable core
platform API, and should be usable, the core_current stubs are not yet
part of the module_current API.
Until that is fixed, add an InetAddressCompat utility that calls the
three static methods by reflection.
Test: atest FrameworksNetTests CtsNetTestCases
Bug: 183097033
Change-Id: I797009aeff1d39ae2dc06ef69d2e235689b43c89
2021-03-18 23:54:04 +09:00
Lucas Lin
91ee69fca8
Merge "Expose systemReady for SystemServer" am: 33737f6ac4 am: 7d2c52067f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640142
Change-Id: Ic700e27e679a1f56b69ef082d4f5c7f5d12f8b6e
2021-03-18 14:29:20 +00:00
Chiachang Wang
28f5f912c5
Merge changes from topic "replaceUidRange" am: 7b582e9749 am: 38794c5290
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626206
Change-Id: Ie767ae0818210b2f4946450bc6784b89514ff3ad
2021-03-18 14:28:58 +00:00
Chiachang Wang
259c30a6de
Merge "Expose APIs for Settings" am: 53178361ae am: 94e9fb339f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644202
Change-Id: I4a65fa2e637a01f13ac14d8413a7be47a37c7937
2021-03-18 14:28:48 +00:00
Lorenzo Colitti
7853e40205
Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8 am: 6ace66ed21
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644265
Change-Id: Ic6865adf525d216d38c999a74bb4ffa35641e8a3
2021-03-18 14:28:32 +00:00
Lucas Lin
7d2c52067f
Merge "Expose systemReady for SystemServer" am: 33737f6ac4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640142
Change-Id: I4680cd76d6e5c074e291bddcf1bd4bd3871365a1
2021-03-18 14:05:03 +00:00
Chiachang Wang
38794c5290
Merge changes from topic "replaceUidRange" am: 7b582e9749
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626206
Change-Id: I3d62d9c03ab6a418e23dd6c5e6f8317b7b375f9c
2021-03-18 14:01:33 +00:00
Chiachang Wang
94e9fb339f
Merge "Expose APIs for Settings" am: 53178361ae
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644202
Change-Id: Ia47e8efc3cc3f40b396c0aa0bd49afea2385e9c3
2021-03-18 13:53:36 +00:00
Lorenzo Colitti
6ace66ed21
Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644265
Change-Id: Ie010e23484d9ec7ad31631d72292cc52c96f2c10
2021-03-18 13:50:18 +00:00
Lucas Lin
33737f6ac4
Merge "Expose systemReady for SystemServer"
2021-03-18 13:40:54 +00:00
Chiachang Wang
7b582e9749
Merge changes from topic "replaceUidRange"
...
* changes:
Expose uids related APIs in NetworkRequest and NetworkCapabilities
Replace the usage of UidRange
2021-03-18 13:36:39 +00:00
Chalard Jean
4c83d1509c
Merge "Address remaining comments on aosp/1607893" am: 08b0411d4f am: ec138734a7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640140
Change-Id: Ib54802430fc785ac4cf6094c42c26bb654b361df
2021-03-18 13:31:33 +00:00
Chalard Jean
80e68e5d1d
Merge "Move constants to MODULE_LIB" am: 229cf59510 am: 39356af73f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640141
Change-Id: Ifc5436f5729ffcc40d069bfc649091d2b8821a0e
2021-03-18 13:31:10 +00:00
Paul Hu
82227141f6
Merge "Add more connectivity module settings" am: 9abe34a466 am: 88d4fc79df
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641784
Change-Id: I269802c5a036181e9eaf90862dbf50b66610f78d
2021-03-18 13:30:33 +00:00
Chiachang Wang
53178361ae
Merge "Expose APIs for Settings"
2021-03-18 13:27:47 +00:00
Lorenzo Colitti
96d66bb7b8
Merge "Add a VpnManager.TYPE_VPN_OEM."
2021-03-18 13:12:08 +00:00
Chalard Jean
ec138734a7
Merge "Address remaining comments on aosp/1607893" am: 08b0411d4f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640140
Change-Id: I49b1ea7e3461ef0cad563d5d7933b5535f94d08c
2021-03-18 12:59:06 +00:00
Chalard Jean
39356af73f
Merge "Move constants to MODULE_LIB" am: 229cf59510
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640141
Change-Id: Ib22b9f3223af2cfe51438e2e19584ec089a4e9d2
2021-03-18 12:55:57 +00:00
Paul Hu
88d4fc79df
Merge "Add more connectivity module settings" am: 9abe34a466
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641784
Change-Id: If6fab011720145f2ba18df478e6660be442bcad5
2021-03-18 12:53:52 +00:00
Chalard Jean
08b0411d4f
Merge "Address remaining comments on aosp/1607893"
2021-03-18 12:30:14 +00:00
Chalard Jean
4de6088dc9
Address remaining comments on aosp/1607893
...
Test: ConnectivityServiceTest
Change-Id: Icf70b20624604bfade37804311a77ef6be564c09
2021-03-18 12:30:00 +00:00