Junyu Lai
e9fe15bfe1
Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: f1d8c34877 am: f3e868f4d0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549817
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4ad38ac5450b06da70f9fd329d79014e352e1656
2021-02-08 22:23:16 +00:00
Junyu Lai
f3e868f4d0
Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: f1d8c34877
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549817
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I304db5e46d8e76d7248b9dd1f42b43200635b2be
2021-02-08 22:09:54 +00:00
Junyu Lai
f1d8c34877
Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services"
2021-02-08 21:40:09 +00:00
Roshan Pius
bd0120da19
Merge "ConnectivityService: Plumb attribution tag for location permission checks" am: 482b2dda4f am: cef5161a27
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534625
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I656644b786bccbe03cdb93a37a0f47e12e5c330d
2021-02-08 19:45:03 +00:00
Roshan Pius
cef5161a27
Merge "ConnectivityService: Plumb attribution tag for location permission checks" am: 482b2dda4f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534625
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5150c4827d8d2a8154afdf4f7076846fe6e38630
2021-02-08 19:26:46 +00:00
Roshan Pius
c97d806148
ConnectivityService: Plumb attribution tag for location permission checks
...
Not currently setting the atttribution tag for location
permission checks. Plumb the attribution tag for all location permision
checks (so that location access is correctly attributed to individual
components within an app)
Bug: 162602799
Test: atest android.net
Test: atest com.android.server
Change-Id: Iee95f05204f51a4f8cb1f36acfb60e8cdeb156f4
2021-02-08 08:13:48 -08:00
Lorenzo Colitti
909af3ded7
Merge changes I4256ca5f,I91528e1a,I48bd594c am: 82c60d022d am: afa74de47d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579985
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5304f83bc029582c2f903669270b713b1678431c
2021-02-08 11:32:13 +00:00
Chiachang Wang
ee026c93fb
Merge "Move shared Proxy method and constants to shared lib" am: c42519e903 am: 067b92e2a7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574816
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0a12cbd0101d6cc637f87e524713ba5056ac6e01
2021-02-08 11:31:48 +00:00
Lorenzo Colitti
afa74de47d
Merge changes I4256ca5f,I91528e1a,I48bd594c am: 82c60d022d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579985
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic761cd9e8e492bcbde117f2b7de7f995b93ea0e7
2021-02-08 11:21:08 +00:00
Chiachang Wang
067b92e2a7
Merge "Move shared Proxy method and constants to shared lib" am: c42519e903
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574816
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4c6ff3c4c82d12334b52871863cc7d6d5c6872c9
2021-02-08 11:00:55 +00:00
Lorenzo Colitti
82c60d022d
Merge changes I4256ca5f,I91528e1a,I48bd594c
...
* changes:
Change ConnectivityServiceTest to prepare for VPN code move.
Add to VpnManager the VPN APIs used by Settings and SystemUI.
Remove temporary hack in VpnTest.
2021-02-08 10:41:32 +00:00
Chiachang Wang
c42519e903
Merge "Move shared Proxy method and constants to shared lib"
2021-02-08 10:27:05 +00:00
Chiachang Wang
0fcb9872b4
Move shared Proxy method and constants to shared lib
...
The static validate() method an PROXY_* constants in Proxy are
used by both module and Settings. After Proxy is moving into
connectivity module, Setting will not able to access them.
Thus, move them to ProxyUtils in net shared lib.
Bug: 172183305
Test: atest FrameworksNetTests
Test: atest CtsNetTestCases:ProxyInfoTest
Change-Id: I02c88aeaeb53d62b87a42a2d8ead9b140b054650
2021-02-08 10:25:07 +00:00
Treehugger Robot
d405f3a995
Merge "[VCN03] Linger the newly connected network for a short time" am: c5bd380f2b am: 733561ba51
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527820
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I30d7e79a273436e49331a0cab285c03be32f5390
2021-02-08 05:57:46 +00:00
Treehugger Robot
733561ba51
Merge "[VCN03] Linger the newly connected network for a short time" am: c5bd380f2b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527820
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icabf50b92925fe3bcb5b45e40cc1c696c73e7380
2021-02-08 05:19:15 +00:00
Chiachang Wang
7bfad333ee
Merge "Create new system API in UserHandle to get uid" am: 2173785652 am: 59a29b670e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573942
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id31355ce04a22c27bb83793b5664a3f6358fd83d
2021-02-08 05:14:09 +00:00
Treehugger Robot
c5bd380f2b
Merge "[VCN03] Linger the newly connected network for a short time"
2021-02-08 04:57:35 +00:00
Chiachang Wang
59a29b670e
Merge "Create new system API in UserHandle to get uid" am: 2173785652
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573942
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia8303c08be1e76ff48e60965518de4d469dc0352
2021-02-08 04:30:03 +00:00
Chiachang Wang
2173785652
Merge "Create new system API in UserHandle to get uid"
2021-02-08 03:56:39 +00:00
Lorenzo Colitti
882630424c
Merge "More cleanly separate requests and listens." am: b46257ecff am: 05bf3641ea
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565202
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iee85ef5889b9bd4ca72115499ac94c8abeb4feb2
2021-02-07 19:08:37 +00:00
Lorenzo Colitti
05bf3641ea
Merge "More cleanly separate requests and listens." am: b46257ecff
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565202
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia7ed944bb1c2b81dd3f6ff74c195a3bc5f22ea51
2021-02-07 18:29:52 +00:00
Lorenzo Colitti
b46257ecff
Merge "More cleanly separate requests and listens."
2021-02-07 18:04:50 +00:00
Lorenzo Colitti
852baaab79
Change ConnectivityServiceTest to prepare for VPN code move.
...
No-op changes to make it easier to review the VPN code move.
1. Set underlying networks via MockVpn, not ConnectivityService.
2. Add a processBroadcastForVpn utility method that we can modify
without too much churn when the code is moved.
Bug: 173331190
Test: test-only change
Change-Id: I4256ca5f33034ef9d1de79857795a6ed1d644e61
2021-02-07 20:40:52 +09:00
Lorenzo Colitti
ff49d2b2fa
Add to VpnManager the VPN APIs used by Settings and SystemUI.
...
Settings and SystemUI use these through raw AIDL calls.
Make them proper manager calls so we can move the implementation
without touching the callers again.
For now these still call into ConnectivityService via
IConnectivityManager. In an upcoming CL the implementation will
move to VpnManagerService.
Test: m
Bug: 173331190
Change-Id: I91528e1ad9948fbaa1fc5e37c61c5eb95f54964e
2021-02-07 20:40:51 +09:00
Lorenzo Colitti
a6e7006967
Remove temporary hack in VpnTest.
...
This temporary hack was necessary due to b/175883995. Now that
that bug is fixed, remove the hack.
Bug: 171529940
Test: test-only change
Change-Id: I48bd594cf3a37575f4888c1be9a1cf535de2e4d2
2021-02-07 20:40:46 +09:00
Lorenzo Colitti
74d34ec687
More cleanly separate requests and listens.
...
Currently, NetworkRequest has several types of requests (LISTEN,
TRACK_DEFAULT, REQUEST, BACKGROUND_REQUEST), and we expect more
to be added.
There are really three categories of request:
1. Requests satisfied by only one network and will keep that
network up, and thus need to be sent to NetworkProviders:
REQUEST, BACKGROUND_REQUEST.
2. Requests satisfied by only one network but will not keep that
network up: TRACK_DEFAULT
3. Requests satisfied by multiple networks and will not keep any
networks up: LISTEN.
Unfortunately the separation is not very clear. Currently, for
any valid request, either isListen() will return true or
isRequest() will return true. This makes it impossible to tell
whether a particular request should be sent to NetworkProviders,
so the current code sends TRACK_DEFAULT requests to
NetworkProviders as well. This is incorrect - a TRACK_DEFAULT
should never keep a network up, for example.
This CL attempts to clarify things by making isRequest() return
false for TRACK_DEFAULT requests and thus never sending them to
NetworkProviders. After this CL:
- isRequest will return true only for requests that attempt to
bring up or keep up a network.
- isListen will return true only for requests that match multiple
networks but do not keep any of them up.
- Neither will return true for TRACK_DEFAULT.
Test: atest ConnectivityServiceTest
Change-Id: I7aad30ade8f7ab2a179e53483d9afd8675f64a12
2021-02-07 18:20:59 +09:00
Serik Beketayev
3eb2f4625d
Merge "Revert "[Mainline] Migrate android.utils package items"" am: 8115741902 am: bb9c442c90
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579467
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0f4812a5404b1b63fae605406aa0b22e1a991ab3
2021-02-07 04:14:35 +00:00
Serik Beketayev
bb9c442c90
Merge "Revert "[Mainline] Migrate android.utils package items"" am: 8115741902
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579467
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I05e76b48f1e2ce22b04b5a05c0cb8a0fd71a103e
2021-02-07 03:55:21 +00:00
Serik Beketayev
8115741902
Merge "Revert "[Mainline] Migrate android.utils package items""
2021-02-07 03:11:47 +00:00
Serik Beketayev
5b49047760
Revert "[Mainline] Migrate android.utils package items"
...
Revert submission 1553146-android_util
Reason for revert: Build Breakage aosp-master/db845c-userdebug @ 7128996
Reverted Changes:
Ia39f6e03f:[Mainline] Migrate android.utils package items
Iaf99140d6:[Mainline] Migrate android.utils package items
Change-Id: I5bdaec5d1a87436510c3e05fadaf0124d86b1bdf
2021-02-06 09:19:47 +00:00
Serik Beketayev
09b3f4e417
Merge "[Mainline] Migrate android.utils package items" am: 2cb320d17b am: 002b5a72a0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552837
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I107d60d02b888e3ac5faa03b1b9dc6a8492e6d14
2021-02-06 08:28:46 +00:00
Serik Beketayev
002b5a72a0
Merge "[Mainline] Migrate android.utils package items" am: 2cb320d17b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552837
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I20f8a0ad33c592c799103d86f64e7755f54fa85a
2021-02-06 07:26:16 +00:00
Serik Beketayev
2cb320d17b
Merge "[Mainline] Migrate android.utils package items"
2021-02-06 07:00:12 +00:00
James Mattis
9febeffaf7
Merge changes Iabad7300,I85363e28 am: d86b977679 am: e2fc895c34
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539241
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic22bfe536e8113ad721a32001911dc496221d871
2021-02-06 05:40:37 +00:00
Treehugger Robot
cecb88898f
Merge "[Mainline] Core Platform APIs migration" am: e205128f1f am: a774bdaacd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546370
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic9075b5338d14a939bedb13fcb57fe4ee527d990
2021-02-06 05:40:14 +00:00
James Mattis
e2fc895c34
Merge changes Iabad7300,I85363e28 am: d86b977679
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539241
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6ff19fad0ddb74c3eccd7fb7d16214e483a3b8a7
2021-02-06 05:14:28 +00:00
Treehugger Robot
a774bdaacd
Merge "[Mainline] Core Platform APIs migration" am: e205128f1f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546370
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If0007ea53f7c4b4c1bbd0d397b848fb951278ec9
2021-02-06 05:04:31 +00:00
James Mattis
d86b977679
Merge changes Iabad7300,I85363e28
...
* changes:
Stubbed setOemNetworkPreference in Connectivity
Update OemNetworkPreferences to use 1:1 Map
2021-02-06 04:33:51 +00:00
Treehugger Robot
e205128f1f
Merge "[Mainline] Core Platform APIs migration"
2021-02-06 04:11:00 +00:00
junyulai
f6d98ec185
[VCN03] Linger the newly connected network for a short time
...
This is mainly used by VCN, where VCN-eligible networks might
be registered before VCN management service can fire request
to prevent the newly created network from being torndown
immediately by ConnectivityService.
Test: atest ConnectivityServiceTest#testNewNetworkLingering
atest ConnectivityServiceTest#testNewNetworkLingering_bgNetwork
atest FrameworksNetTests --rerun-until-failure 20
Bug: 175180558
Change-Id: I7768daf4cf2d8f6d8057b5107412e06104ba82e0
2021-02-06 11:22:31 +08:00
Aaron Huang
4bec1c714d
Merge "Update VpnTest for new restricted API" am: 20507cf1f9 am: 1fb754cc9c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554177
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I76d0e305bbace9c41a1ca44bad660391bbe79297
2021-02-05 12:01:40 +00:00
Aaron Huang
1fb754cc9c
Merge "Update VpnTest for new restricted API" am: 20507cf1f9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554177
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I47baf5985f00722b5be3402668cfe7ff4942e6d1
2021-02-05 11:22:34 +00:00
Aaron Huang
20507cf1f9
Merge "Update VpnTest for new restricted API"
2021-02-05 10:52:54 +00:00
Treehugger Robot
7113304b38
Merge "Add @Nullable to Object#equals()" am: 009f021811 am: 2a61f079a8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574815
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d13a249fabc93baaa0d01de3f9c6cec7ddd11e4
2021-02-05 10:20:50 +00:00
Junyu Lai
ea671ec39e
Merge "[VCN09] Rename linger timer" am: 5ae251610d am: 7604c69dff
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571902
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2290180e6891e9f568140ecf9e79dd9b237e06bd
2021-02-05 10:20:27 +00:00
Remi NGUYEN VAN
aee39eb58d
Merge "Remove legacy network factories" am: e035041e55 am: a18ae04565
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574684
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If74d226cc09ea1f1b1a70423084fbd018dba2e63
2021-02-05 10:20:00 +00:00
Treehugger Robot
2a61f079a8
Merge "Add @Nullable to Object#equals()" am: 009f021811
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574815
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I523eb00d30bfedeb6e7533a94868016171846a59
2021-02-05 10:01:23 +00:00
Junyu Lai
7604c69dff
Merge "[VCN09] Rename linger timer" am: 5ae251610d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571902
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0b69d6ac4d273b836c5ce36c79fc3ebb6c964634
2021-02-05 09:40:31 +00:00
Treehugger Robot
009f021811
Merge "Add @Nullable to Object#equals()"
2021-02-05 09:36:41 +00:00
Junyu Lai
5ae251610d
Merge "[VCN09] Rename linger timer"
2021-02-05 09:29:12 +00:00