Xin Li
3a388bf8a4
[automerger skipped] Merge ab/7061308 into stage. am: e8cbbd6b6c -s ours
...
am skip reason: Change-Id I4bf82035631ccff6d5a6144d6d9b1d203b076851 with SHA-1 3078660c4e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13657544
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie387abaa6af0c76ebd6801707d21443ebbda5c93
2021-02-23 09:05:19 +00:00
Xin Li
e8cbbd6b6c
Merge ab/7061308 into stage.
...
Bug: 180401296
Merged-In: I4bf82035631ccff6d5a6144d6d9b1d203b076851
Change-Id: I1b5f3a672a55eaabba0f5389bab110b395553559
2021-02-21 09:39:53 -08:00
James Mattis
527cae16f6
Merge "Using defensive copy for default request remove" am: be9a647b2c am: c3232523e3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597518
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7e342da488c7b9271b135a462312d3275abde692
2021-02-21 06:15:29 +00:00
James Mattis
c3232523e3
Merge "Using defensive copy for default request remove" am: be9a647b2c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597518
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f49286ef328f95212fec94a5d747aa2936a88ef
2021-02-21 05:15:14 +00:00
James Mattis
be9a647b2c
Merge "Using defensive copy for default request remove"
2021-02-21 04:28:13 +00:00
James Mattis
15c1b2108c
Using defensive copy for default request remove
...
Passing in a defensive copy for the default requests in
ConnectivityService prior to updating that collection so as to not have
issues when removing elements as part of the per-app preference update
flow.
Bug: 176494815
Bug: 178632672
Test: atest FrameworksNetTests
atest FrameworksNetTests:com.android.server
.ConnectivityServiceTest#testSetOemNetworkPreference
ClearPreviousOemValues --iterations
Change-Id: Ia683d5035dda2be35fd2f2b7ee038e806caab6f9
2021-02-20 15:51:24 -08:00
James Mattis
c60471d42b
Merge "Unit test automation for Multilayer Evaluation" am: ef921b95d7 am: f354f527ae
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579206
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I27cc11033aa430ba5af00773351bb5e54b488aff
2021-02-20 22:40:03 +00:00
James Mattis
f354f527ae
Merge "Unit test automation for Multilayer Evaluation" am: ef921b95d7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579206
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I888bc951d1e54d4773f06fa9b61eefe815eb5462
2021-02-20 22:10:34 +00:00
James Mattis
ef921b95d7
Merge "Unit test automation for Multilayer Evaluation"
2021-02-20 21:23:45 +00:00
Junyu Lai
5f3fa05704
Merge "[FUI15] Remove networkId in NetworkState" am: c8ae3c432b am: 6d8a6d5f70
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542749
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5b833f1a9c95ad61190182e48a1b6e8ad3bf8807
2021-02-20 16:36:54 +00:00
Junyu Lai
6d8a6d5f70
Merge "[FUI15] Remove networkId in NetworkState" am: c8ae3c432b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542749
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9243f1cc94c73e3312f3a85fa34d3499bc92accd
2021-02-20 15:51:56 +00:00
Junyu Lai
c8ae3c432b
Merge "[FUI15] Remove networkId in NetworkState"
2021-02-20 14:00:19 +00:00
Chiachang Wang
6468f11dcb
Merge changes I0a75c440,Ief9e8925,Ie03e8276,If0ac9a64,I716bd771 am: d55023c6e9 am: 634db1b9de
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573943
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1e81aa264d988cc50f2d42f8b9592f050a01b69f
2021-02-20 04:22:17 +00:00
Chiachang Wang
634db1b9de
Merge changes I0a75c440,Ief9e8925,Ie03e8276,If0ac9a64,I716bd771 am: d55023c6e9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573943
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I20a0f2d4a59222083d1c17a7732b7fe0b8461502
2021-02-20 03:41:04 +00:00
James Mattis
108bb667ce
Merge "Unit tests for Multi-Default with Existing APIs" am: 090909cb3d am: 33451af2f2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579208
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I71645ff80bf4da307e12f1a96dba832c434c0eff
2021-02-20 02:40:47 +00:00
James Mattis
33451af2f2
Merge "Unit tests for Multi-Default with Existing APIs" am: 090909cb3d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579208
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibc47b166c6ea68ef0c059edfd1a0aa93c0aa1fc3
2021-02-20 02:04:02 +00:00
Chiachang Wang
d55023c6e9
Merge changes I0a75c440,Ief9e8925,Ie03e8276,If0ac9a64,I716bd771
...
* changes:
[IT06]Move INetworkActivityListener into connectivity module
[IT05] Remove the unused network activity logic out from NMS
[IT4.7] Add network activity info into dumpsys for debugging
[IT4.6] Unbundle NMS out from ConnectivityManager
[IT4.5] Update radio power from CS directly
2021-02-20 02:02:46 +00:00
James Mattis
84b4bb86d4
Unit test automation for Multilayer Evaluation
...
Unit test automation for multilayer network hierarchy evaluation
when using the setOemNetworkPreference() API ConnectivityService.
Bug: 178632672
Bug: 176494815
Bug: 170068946
Test: atest FrameworksNetTests
Change-Id: Ia9b76f49a07eff6a3977faaa41fc67a10f307841
2021-02-19 17:41:01 -08:00
James Mattis
090909cb3d
Merge "Unit tests for Multi-Default with Existing APIs"
2021-02-20 01:38:52 +00:00
Nataniel Borges
ea2109dfb4
Merge "Revert "Delete VPN methods in ConnectivityManager."" am: 19261dd671 am: e14f718270
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596592
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ice973f502bb389d1ff400bbcd206987d48ff07dd
2021-02-19 16:39:39 +00:00
Lorenzo Colitti
9d99263e49
Merge "Delete VPN methods in ConnectivityManager." am: e66719e8ed am: bd53da5929
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1594171
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I247b42083f5fe9d4f5e3a13a3b3c61ab2bcf5bcc
2021-02-19 16:39:19 +00:00
Nataniel Borges
e14f718270
Merge "Revert "Delete VPN methods in ConnectivityManager."" am: 19261dd671
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596592
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3572428c0044d410055a53f4bff680c2dd474028
2021-02-19 16:12:03 +00:00
Lorenzo Colitti
bd53da5929
Merge "Delete VPN methods in ConnectivityManager." am: e66719e8ed
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1594171
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8b2968f3b0c6ed9d693f56c4f4697f410c706085
2021-02-19 16:06:51 +00:00
Nataniel Borges
19261dd671
Merge "Revert "Delete VPN methods in ConnectivityManager.""
2021-02-19 15:32:46 +00:00
Nataniel Borges
66ef4728a1
Revert "Delete VPN methods in ConnectivityManager."
...
This reverts commit 2698d0c254 .
Bug: 180710918
Reason for revert: Broken build
Change-Id: I6e6318b4c01ccab27ca3e9f16bb2194aa1d9ffd2
2021-02-19 15:25:33 +00:00
Lorenzo Colitti
e66719e8ed
Merge "Delete VPN methods in ConnectivityManager."
2021-02-19 14:56:04 +00:00
Lorenzo Colitti
8f5de657a6
Merge changes I0e6df469,I3d46d5f7 am: 05baf850c4 am: 263ead791b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I307dce7840699d1145be3a57c1f03623bd521c04
2021-02-19 09:18:11 +00:00
Lorenzo Colitti
fb0f6ac08b
Merge "Fix all Log.wtfs in FrameworksNetTests." am: 326cf02637 am: f8b5e2a497
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591458
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I640d298f2d25ba1784795c79c38a2561cf9c8882
2021-02-19 09:16:44 +00:00
Lorenzo Colitti
263ead791b
Merge changes I0e6df469,I3d46d5f7 am: 05baf850c4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I13daedf40a5b0569b78ace23f36ab971c45bc690
2021-02-19 09:10:19 +00:00
Lorenzo Colitti
2698d0c254
Delete VPN methods in ConnectivityManager.
...
1. Stop using ConnectivityManager for VPNs in VpnDialogs.
2. Delete updateLockdownVpn, since all callers have been migrated
to calling VpnManager directly.
3. Delete the call to VpnManager in factoryReset, since the only
caller (ResetNetworkConfirm) has been updated to call into
VpnManager directly.
4. Delete getVpnManager, since it is now unused.
Test: m
Bug: 173331190
Change-Id: I5d071281c0e36f6523fea10671a9abf994c66d66
2021-02-19 17:34:30 +09:00
Lorenzo Colitti
f8b5e2a497
Merge "Fix all Log.wtfs in FrameworksNetTests." am: 326cf02637
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591458
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iedc95830b855eb2da7a5e9b9f7da2fea07a88962
2021-02-19 08:28:14 +00:00
Lorenzo Colitti
05baf850c4
Merge changes I0e6df469,I3d46d5f7
...
* changes:
Fix testMobileDataAlwaysOn flakiness
Speed up NetworkFactory tests.
2021-02-19 08:13:38 +00:00
Lorenzo Colitti
326cf02637
Merge "Fix all Log.wtfs in FrameworksNetTests."
2021-02-19 07:49:27 +00:00
Treehugger Robot
8fed861718
Merge "Use formal API for ActivityThread to set proxy" am: 86ecbddaf0 am: 2074561653
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512874
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifae677c9751d618617083696a89252f11bd222b4
2021-02-19 07:06:33 +00:00
Treehugger Robot
2074561653
Merge "Use formal API for ActivityThread to set proxy" am: 86ecbddaf0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512874
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I917bf20c932395ac07089059e1c46fe46de4d1f4
2021-02-19 06:47:31 +00:00
Treehugger Robot
86ecbddaf0
Merge "Use formal API for ActivityThread to set proxy"
2021-02-19 05:42:06 +00:00
Remi NGUYEN VAN
9ff113bbe1
Use formal API for ActivityThread to set proxy
...
Add setHttpProxyConfiguration to the public API, and use
ConnectivityManager APIs from ActivityThread (instead of hidden APIs) to
get/set the proxy for an app process.
The default proxy is now initialized with getDefaultProxy instead of
getProxyForNetwork(null); this should not make a difference, as nothing
should have called bindProcessToNetwork at that point yet.
Bug: 174436414
Test: m; device boots
Merged-In: Ifb516194ecde1567cea4b6806946091cdcf2f015
Change-Id: I06b797eeae54609aecdc0afe1df4e6c602a17a69
2021-02-19 13:53:56 +09:00
Remi NGUYEN VAN
4bc1427ca3
Merge "Split parcelable .aidl files to aidl-export" am: 75c728d254 am: a6d619df36
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589694
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5ec4e1ad60bd8081ef37641722e247464ecd34e9
2021-02-19 04:20:33 +00:00
Remi NGUYEN VAN
a6d619df36
Merge "Split parcelable .aidl files to aidl-export" am: 75c728d254
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589694
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I35bcfe8b6861b1fbf7eb7c7f43dafe84ec364634
2021-02-19 03:46:20 +00:00
Remi NGUYEN VAN
75c728d254
Merge "Split parcelable .aidl files to aidl-export"
2021-02-19 02:21:25 +00:00
Lorenzo Colitti
cf4fb16228
Fix all Log.wtfs in FrameworksNetTests.
...
These cause the tests to crash on eng builds, so disrupt
development.
Test: atest FrameworksNetTests passes on eng build
Change-Id: Ifa5131fdb8f57af812cf688970be6588d2879c29
2021-02-18 21:13:04 +09:00
Chalard Jean
0e5188da24
Merge "Optimization when looking up requests for release" am: 0cb136a9c5 am: 86059bafb6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592999
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icc3d2f8cd3716cd7302fde4192fb345c1d8ce00f
2021-02-18 10:09:56 +00:00
Chalard Jean
86059bafb6
Merge "Optimization when looking up requests for release" am: 0cb136a9c5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592999
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I47310ae059b93921206dff400d35ae024e400325
2021-02-18 09:26:16 +00:00
Chalard Jean
0cb136a9c5
Merge "Optimization when looking up requests for release"
2021-02-18 08:33:09 +00:00
Chalard Jean
1cd19ed4cb
Fix testMobileDataAlwaysOn flakiness
...
Test: atest --iterations 100 CST#testMobileDataAlwaysOn
Change-Id: I0e6df4694752dab7a5938e8f8bd88c7da7c3fcd5
2021-02-18 16:45:27 +09:00
Chalard Jean
3d8d563e24
Speed up NetworkFactory tests.
...
Somehow this big slowdown escaped review.
Test: ConnectivityServiceTest
Change-Id: I3d46d5f7a986b3586b7e6044eb10aba756bb6ceb
2021-02-18 16:45:26 +09:00
Lorenzo Colitti
7d15f97106
Merge "Fix merge conflict." am: 8e97e8b968 am: 5721650852
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592111
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d070661be72383036f1b16a0c2396840c7e7475
2021-02-18 07:20:12 +00:00
Lorenzo Colitti
5721650852
Merge "Fix merge conflict." am: 8e97e8b968
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592111
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iacfb147645ff01c270ebeefde7ab1b9b61bafd44
2021-02-18 06:36:08 +00:00
Lorenzo Colitti
8e97e8b968
Merge "Fix merge conflict."
2021-02-18 05:22:56 +00:00
Chiachang Wang
e9bc163a29
[IT06]Move INetworkActivityListener into connectivity module
...
INetworkActivityListener is hidden and the only usage is inside
the connectivity module. Thus, move this into module scope.
Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I0a75c440c1daa773217bbd362b212fda4d07ec64
2021-02-18 12:03:21 +08:00