Merge "Add startCaptivePortalApp to system API"
Chiachang Wang
authored and
Gerrit Code Review
commited 2021-03-19 11:30:20 +00:00
9e18198cc5
Merge "[NS03] Mix in other CS-managed properties" am: dc2fed3454 am: 4ff025d8a5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556101
Change-Id: I6c325a102c93459a377e0a8670176f0989f88738
Chalard Jean
authored and
Automerger Merge Worker
commited 2021-03-19 11:07:51 +00:00
be8093b125
Merge "Expose getCapabilities" am: 0f441f7bdd am: e988cf4321
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641919
Change-Id: I5a7df27d7b6f7eca0364c3d88d4ad8663063cb3e
Lucas Lin
authored and
Automerger Merge Worker
commited 2021-03-19 11:07:40 +00:00
bf42eae162
[automerger skipped] Merge "Reland "Add an API to listen for changes in network blocked status of an uid."" am: cd3ea1f002 -s ours am: e58eafa8c4 -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/+/1646326
Change-Id: Iffa4b2d7c7a9d03a70a6a01a545bb91e88bfebb1
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-03-19 11:07:23 +00:00
363f1b34c4
Merge "[NS03] Mix in other CS-managed properties" am: dc2fed3454
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556101
Change-Id: I7b904af6c34190f53378cc1acc518840b527d434
Chalard Jean
authored and
Automerger Merge Worker
commited 2021-03-19 10:52:23 +00:00
4ff025d8a5
Merge "Expose getCapabilities" am: 0f441f7bdd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641919
Change-Id: Ie524f7538aa7a7048c55097c0995d8c6194dc682
Lucas Lin
authored and
Automerger Merge Worker
commited 2021-03-19 10:49:12 +00:00
e988cf4321
[automerger skipped] Merge "Reland "Add an API to listen for changes in network blocked status of an uid."" am: cd3ea1f002 -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/+/1646326
Change-Id: I19a6e876187a5cf64a00c3f2dac15c8bec8f2911
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-03-19 10:46:12 +00:00
e58eafa8c4
Merge "[NS03] Mix in other CS-managed properties"
Chalard Jean
authored and
Gerrit Code Review
commited 2021-03-19 10:32:46 +00:00
dc2fed3454
Merge "Expose getCapabilities"
Lucas Lin
authored and
Gerrit Code Review
commited 2021-03-19 10:24:25 +00:00
0f441f7bdd
Merge "Reland "Add an API to listen for changes in network blocked status of an uid.""
Treehugger Robot
authored and
Gerrit Code Review
commited 2021-03-19 10:12:15 +00:00
cd3ea1f002
Merge "Send a Network instead of network id for wifi no internet dialog" am: 94dc99ea38 am: 3ff1e2fe49
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644766
Change-Id: I1428a4bf9be18601ff70e8fc50e06fecac158a4b
Chiachang Wang
authored and
Automerger Merge Worker
commited 2021-03-19 09:02:20 +00:00
7bbc040746
Merge "Remove hidden API usage from ProxyTracker" am: ed15b01b0d am: 2f04604df2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646966
Change-Id: Idd7ae6ad01db35ed2ea47abab183ae423439ede9
Aaron Huang
authored and
Automerger Merge Worker
commited 2021-03-19 09:02:08 +00:00
330ba163d9
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
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-03-19 09:01:55 +00:00
c3b003da37
Merge "Send a Network instead of network id for wifi no internet dialog" am: 94dc99ea38
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644766
Change-Id: I676152104fafb5c4e1b93f0e39fa39e43dd6891c
Chiachang Wang
authored and
Automerger Merge Worker
commited 2021-03-19 08:27:56 +00:00
3ff1e2fe49
Merge "Remove hidden API usage from ProxyTracker" am: ed15b01b0d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646966
Change-Id: I2d609875a3a31586626a82dddbfcb015bf5ca0bf
Aaron Huang
authored and
Automerger Merge Worker
commited 2021-03-19 08:27:14 +00:00
2f04604df2
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
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-03-19 08:24:59 +00:00
18e2734d2f
Merge "Send a Network instead of network id for wifi no internet dialog"
Chiachang Wang
authored and
Gerrit Code Review
commited 2021-03-19 07:54:24 +00:00
94dc99ea38
Merge "Remove hidden API usage from ProxyTracker"
Aaron Huang
authored and
Gerrit Code Review
commited 2021-03-19 07:50:27 +00:00
ed15b01b0d
Merge "Ensure all calls to getCallingUid use the version in mDeps."
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2021-03-19 07:36:52 +00:00
a6b1b9d110
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
Chalard Jean
authored and
Automerger Merge Worker
commited 2021-03-19 06:44:12 +00:00
ff706470e9
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
Chalard Jean
authored and
Automerger Merge Worker
commited 2021-03-19 06:05:28 +00:00
211f271ce4
Remove hidden API usage from ProxyTracker
...
Connectivity mainline module cannot use HandlerExecutor because it
is a hidden API. So, replace it with alternative.
Bug: 177035719
Test: FrameworksNetTests
Change-Id: I228a8a2e3479b0af1e977d13f877a565f0789a7e
Aaron Huang
commited 2021-03-19 06:03:08 +00:00
d1a8c71ed9
Merge "[NS02] Mix in validation of the score"
Chalard Jean
authored and
Gerrit Code Review
commited 2021-03-19 05:39:40 +00:00
a5323dd580
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
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-03-19 05:27:46 +00:00
9f4d989074
[NS03] Mix in other CS-managed properties
...
These properties are necessary to figure out the maximum
score of a network.
Test: FrameworksNetTests
Change-Id: I48dce20ad4a80597039393dca607e8da829b2a61
Chalard Jean
commited 2021-03-19 13:50:56 +09:00
67b66080a0
[NS02] Mix in validation of the score
...
Test: FrameworksNetTests FrameworksWifiTests NetworkStackTests
Change-Id: I9cac3a05ad0c4008599973b12d2c5e4c02233a5c
Chalard Jean
commited 2021-03-19 13:50:56 +09:00
6bde0e5c04
Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" am: f678876c62
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640985
Change-Id: I26db95ad9d91dec40a62b7e4c4c0b77133ddb5d3
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-03-19 04:42:53 +00:00
cbb8786faf
Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API"
Treehugger Robot
authored and
Gerrit Code Review
commited 2021-03-19 04:13:36 +00:00
f678876c62
Revert "Revert "Expose uids related APIs in NetworkRequest and N..."
...
Revert^2 "Add shims for NetworkRequest"
b72b3ca768fc25ef72dc78f1396b08447b8ef5c6
NetworkRequest is moving into the incoming connectivity mainline
module. The hidden setUids becomes inaccessible outside the
module. Shims for support cts in different API levels will need
to use it to verify the behavior of NetworkRequest. Thus, expose
it to the API surface.
Also, VPN uses getUids and setUids to control network
capabilities. Networkcapabilities is a part of incoming
connectivity mainline module but VPN is not. Thus, exposing these
two methods are needed to allow VPN to continue using it.
Test: make update-api
Bug: 172183305
Change-Id: I4b8e1aa558e3459a932535f9901f4ae86b0ecb67
Merged-In: I107c329d4d7130d488772166eae8b5e7aaa2ff04
Chiachang Wang
commited 2021-03-19 02:12:17 +00:00
8d81c8d76b
Revert^2 "Replace the usage of UidRange"
...
f0b9889ccf
UidRange is used in a shared way between ConnectivityService
and VPN through the use of NetworkCapabilities. UidRange will
be part of the ConnectivityService mainline but Vpn.java will
stay in the framework. We need a way to replace the APIs using
UidRange, or to make UidRange system API. The only really
relevant surface here is NetworkCapabilities#{setUids, getUids}.
The need for UidRange could be replaced by an integer Range, so
replace the usage of UidRange by a integer Range in
NetworkCapabilities#{setUids, getUids} and update the relevant
callers.
Bug: 172183305
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Change-Id: I0f679fb5fb8f4fe26461ca4912ca1fdfe7f43c9e
Merged-In: I4e5aec6ef1ea02e038fcd7ed117a3b67b69c5cb9
Chiachang Wang
commited 2021-03-19 02:11:07 +00:00
16cbb7423a
Send a Network instead of network id for wifi no internet dialog
...
It's a refactor work for incoming connectivity mainline. The
network information contained in the no internet notification
action was placed the target network id. The receiver which is
Settings will need to construct the network from the network id
using the hidden Network constructor. Since Network is moving
into module, Settings will not be able to access it. Apps should
use Network instead of network id, so just send the network
object to Settings.
Bug: 172183305
Test: manually test with no internet dialog and check the
behavior and log
Test: atest FrameworksNetTests
Change-Id: I68acc70a26a27eeeb9ab7af068a459905839f942
Chiachang Wang
commited 2021-03-19 02:08:01 +00:00
ef52aade37
Merge "Add InetAddressCompat" am: e1da163302 am: 2aec625379
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645289
Change-Id: I94fef501699aa01c997a03dd24a5a25442075af1
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-03-19 01:10:06 +00:00
9bdd98e71d
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
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-03-19 01:09:30 +00:00
b4525057e5
Merge "Add InetAddressCompat" am: e1da163302
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645289
Change-Id: I6946ca309ae923a637f5e5f0ad73c91b26b3c376
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-03-19 00:39:34 +00:00
2aec625379
Merge "Move network selection utils to Connectivity" am: f0f68f5561
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645291
Change-Id: I452591707a97b501f189fa9f61e90da842fa3734
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-03-19 00:35:03 +00:00
b1155aa195
Merge "Add InetAddressCompat"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2021-03-18 23:58:16 +00:00
e1da163302
Merge "Move network selection utils to Connectivity"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2021-03-18 23:57:34 +00:00
f0f68f5561
Reland "Add an API to listen for changes in network blocked status of an uid."
...
This reverts commit d88174dafd .
Reason for revert: The issue causing the build breakage has been fixed
Change-Id: I03fa406551b51aaa4d4d9255cf1a53f9b4bcc1bd
Merged-In: Ib9949b8619c6b148f73630b314c4113d76c31ec1
Sudheer Shanka
commited 2021-03-18 19:11:55 +00:00
e95b266e54
[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
Anthony Stange
authored and
Automerger Merge Worker
commited 2021-03-18 17:26:47 +00:00
0a45e2c173
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
Anthony Stange
authored and
Automerger Merge Worker
commited 2021-03-18 17:26:18 +00:00
a2c19b719d
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
Sudheer Shanka
authored and
Automerger Merge Worker
commited 2021-03-18 17:25:15 +00:00
0a57ff459d
[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
Anthony Stange
authored and
Automerger Merge Worker
commited 2021-03-18 17:11:21 +00:00
00a2a4c7ce
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
Anthony Stange
authored and
Automerger Merge Worker
commited 2021-03-18 17:02:59 +00:00
37cb1551a0
Merge "Revert "Add an API to listen for changes in network blocked status of an uid.""
Anthony Stange
authored and
Gerrit Code Review
commited 2021-03-18 16:52:08 +00:00
2bb1da3473
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
Anthony Stange
commited 2021-03-18 16:51:22 +00:00
d88174dafd
Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE"
...
* changes:
Revert "Replace the usage of UidRange"
Revert "Expose uids related APIs in NetworkRequest and NetworkCa..."
Anthony Stange
authored and
Gerrit Code Review
commited 2021-03-18 16:40:53 +00:00
2576238aec
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
Anthony Stange
commited 2021-03-18 16:30:59 +00:00
f0b9889ccf
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
Anthony Stange
commited 2021-03-18 16:30:59 +00:00
84d92b3ce1
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
Sudheer Shanka
authored and
Automerger Merge Worker
commited 2021-03-18 16:09:58 +00:00
5580953ba4
Merge "Add an API to listen for changes in network blocked status of an uid."
Sudheer Shanka
authored and
Gerrit Code Review
commited 2021-03-18 15:29:17 +00:00
c262455617