James Mattis
c090ae6387
Merge "Applying OEM network pref to all users" am: 3f0925ee2e am: 00f75b0b32 am: 68fad37f38
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612760
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9988f9ecac19976dd78dbcf9a749adba5daa578c
2021-03-05 22:37:45 +00:00
James Mattis
68fad37f38
Merge "Applying OEM network pref to all users" am: 3f0925ee2e am: 00f75b0b32
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612760
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5ec8289855a810504e82b8828a4160929f13d19b
2021-03-05 22:11:25 +00:00
James Mattis
00f75b0b32
Merge "Applying OEM network pref to all users" am: 3f0925ee2e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612760
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id805612e7b807dd789c4ff88a933660fb11b12cf
2021-03-05 21:39:23 +00:00
James Mattis
3f0925ee2e
Merge "Applying OEM network pref to all users"
2021-03-05 19:09:24 +00:00
Zoey Chen
c99db5dfd6
Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part1" into sc-dev
2021-03-05 14:50:27 +00:00
Remi NGUYEN VAN
1285b9ca40
Merge "Move NetworkState to Connectivity" am: 4d2ad2a68a am: 65982d493b am: d7e667b28f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620379
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icea1247fd498e8661cb8cba68d34a443004a246d
2021-03-05 12:32:57 +00:00
Remi NGUYEN VAN
d7e667b28f
Merge "Move NetworkState to Connectivity" am: 4d2ad2a68a am: 65982d493b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620379
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3f87db84ac7d49c7f781ff9bd188f90dac54db8e
2021-03-05 11:56:39 +00:00
Remi NGUYEN VAN
65982d493b
Merge "Move NetworkState to Connectivity" am: 4d2ad2a68a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620379
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie8eda98704327d894b59c335753739600b87f670
2021-03-05 11:33:30 +00:00
Remi NGUYEN VAN
4d2ad2a68a
Merge "Move NetworkState to Connectivity"
2021-03-05 10:27:57 +00:00
Aaron Huang
b78e65506f
[automerger skipped] Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" am: 74850ac20e am: 3c79f13642 am: a095858f1f -s ours
...
am skip reason: Change-Id I3dac94ec06f673aa719e124f1ef3d8169f68f9fb with SHA-1 d101ec8f87 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574864
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib458f32902e64c63fc1fc9e2bb5bf92be801916b
2021-03-05 09:04:17 +00:00
Aaron Huang
a095858f1f
Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" am: 74850ac20e am: 3c79f13642
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574864
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ide9ccdb7a50e3d674cb85dfffa014c89ee52db3e
2021-03-05 08:23:08 +00:00
Aaron Huang
3c79f13642
Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" am: 74850ac20e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574864
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6fd08a8ba2bcbe4a955c245f49be517794f8a91
2021-03-05 07:45:53 +00:00
Treehugger Robot
52ccd5b9dd
Merge "[FUI22] Support getAllNetworkStateSnapshot" am: bcbc04f329 am: f216522f0f am: 54c1b0624f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614779
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I52f8339bd1cda35a3f26f28fd3c0165f6f6ff91e
2021-03-05 07:10:46 +00:00
Remi NGUYEN VAN
08c07c9fd2
Merge "Replace user with debuggable check in ConnectivityService" am: a923322f24 am: 4386582dd2 am: 68d10c47df
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615085
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2c8746e54e1461c54f8064f9fd016361b5f2e6ef
2021-03-05 07:10:18 +00:00
Chalard Jean
2e68a8ee6e
Merge "Generalize some PANS methods" am: b639d79547 am: 9b385fa220 am: e05c37b5ec
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612258
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iee4826c66d5187608d0afa8f23fa45f1efe34a2b
2021-03-05 07:09:15 +00:00
Aaron Huang
74850ac20e
Merge "Use NetworkCallback in BatteryStatsService to get connectivity change"
2021-03-05 07:03:51 +00:00
Treehugger Robot
54c1b0624f
Merge "[FUI22] Support getAllNetworkStateSnapshot" am: bcbc04f329 am: f216522f0f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614779
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie34762b31c98bd86f121f17112677cb33704f481
2021-03-05 06:20:16 +00:00
Remi NGUYEN VAN
68d10c47df
Merge "Replace user with debuggable check in ConnectivityService" am: a923322f24 am: 4386582dd2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615085
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I00949470243a8ca63b401810bc9cb4ad3631e038
2021-03-05 06:19:52 +00:00
Chalard Jean
e05c37b5ec
Merge "Generalize some PANS methods" am: b639d79547 am: 9b385fa220
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612258
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9203b1f45d072694bffad33f6e4e9d4b12185a4a
2021-03-05 06:19:21 +00:00
Chiachang Wang
b81bcd2a1e
[automerger skipped] Merge "Have the DataConnectionStat started from BSS" am: 86dce50c72 am: 658a53ccef am: dc14b38157 -s ours
...
am skip reason: Change-Id I0c2c1b90df7a107ee75e81fd49d39d65678204c0 with SHA-1 0e9d1fe100 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607895
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4b0b579fb1fd4a8ddba8fa55222899b5c63642f3
2021-03-05 06:00:26 +00:00
Janis Danisevskis
2ed485da9d
[automerger skipped] Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." am: c410b053b9 am: d8fb75701d am: bb865ae949 -s ours
...
am skip reason: Change-Id I27975113896ea137260a9f94a34fb1c3ca173fe3 with SHA-1 42f77b882f is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569502
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0bd42249b22890ef71ece31e70e7c9a61cdb50e1
2021-03-05 05:59:25 +00:00
Treehugger Robot
f216522f0f
Merge "[FUI22] Support getAllNetworkStateSnapshot" am: bcbc04f329
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614779
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I70cbeb9d2b5b4cb2d09d31444b5d60e887b7e8c2
2021-03-05 05:53:33 +00:00
Remi NGUYEN VAN
4386582dd2
Merge "Replace user with debuggable check in ConnectivityService" am: a923322f24
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615085
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieb729be68e810972506b1d8a3960dfc371a294b1
2021-03-05 05:50:47 +00:00
Chalard Jean
9b385fa220
Merge "Generalize some PANS methods" am: b639d79547
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612258
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7baa17a0f882ec21f766c9f7dc2c0694853fb467
2021-03-05 05:47:57 +00:00
Chiachang Wang
dc14b38157
Merge "Have the DataConnectionStat started from BSS" am: 86dce50c72 am: 658a53ccef
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607895
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I63ec8e62d944828c1c6c7b9fa948a60a87f7d9e7
2021-03-05 05:43:32 +00:00
Janis Danisevskis
bb865ae949
Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." am: c410b053b9 am: d8fb75701d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569502
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I77346383545bd79d9406b5711f969e07eb1e66f0
2021-03-05 05:41:50 +00:00
Chiachang Wang
658a53ccef
Merge "Have the DataConnectionStat started from BSS" am: 86dce50c72
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607895
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7f9e9d496c92e86609871c93a08b819b3704314f
2021-03-05 05:37:43 +00:00
Treehugger Robot
52871db64d
Merge "Fix CaptivePortalTest before R" am: 73e63132a6 am: a2229ce85b am: 42b8c94fae
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618939
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2cdd1dfce5a162c6e630bc6c95d99a08ff7f0169
2021-03-05 05:22:29 +00:00
Treehugger Robot
42b8c94fae
Merge "Fix CaptivePortalTest before R" am: 73e63132a6 am: a2229ce85b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618939
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib5bf1fc2b06fb5339ffd9b43d0eda893a4bbc4bd
2021-03-05 05:18:27 +00:00
Janis Danisevskis
d8fb75701d
Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." am: c410b053b9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569502
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I97b24a5462f42773df919bd1d7acf9a9c5dcd43c
2021-03-05 05:17:12 +00:00
Treehugger Robot
bcbc04f329
Merge "[FUI22] Support getAllNetworkStateSnapshot"
2021-03-05 05:16:43 +00:00
Remi NGUYEN VAN
a923322f24
Merge "Replace user with debuggable check in ConnectivityService"
2021-03-05 05:09:46 +00:00
Treehugger Robot
a2229ce85b
Merge "Fix CaptivePortalTest before R" am: 73e63132a6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618939
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I29443e1af761cca33185638e5bd84771e0bc9192
2021-03-05 05:03:21 +00:00
Chalard Jean
b639d79547
Merge "Generalize some PANS methods"
2021-03-05 04:48:39 +00:00
James Mattis
5e59b246a9
Merge "Unit test automation for Multi-Default Tracking" into sc-dev
2021-03-05 03:01:40 +00:00
Chiachang Wang
86dce50c72
Merge "Have the DataConnectionStat started from BSS"
2021-03-05 02:59:33 +00:00
Janis Danisevskis
c410b053b9
Merge "Keystore 2.0: Make VPN Keystore 2.0 ready."
2021-03-05 02:57:34 +00:00
Treehugger Robot
73e63132a6
Merge "Fix CaptivePortalTest before R"
2021-03-05 02:28:55 +00:00
Chiachang Wang
88da6662e4
Merge "Have the DataConnectionStat started from BSS" into sc-dev
2021-03-05 00:29:54 +00:00
Remi NGUYEN VAN
072b33fc6c
Move NetworkState to Connectivity
...
NetworkState is becoming an internal implementation class, with
NetworkStateSnapshot replacing it as a proper API. Considering this it
belongs inside Connectivity.
Bug: 174123988
Test: m
Change-Id: I201f1a07c50d9da31e33f5c207875da8863ef57c
2021-03-05 08:56:55 +09:00
James Mattis
b4c62b8862
Unit test automation for Multi-Default Tracking
...
Unit test automation validating how multiple default networks are
tracked within ConnectivityService when set by network preferences
used with setOemNetworkPreference() API functionality.
Bug: 178632672
Bug: 172347841
Bug: 170068946
Test: atest FrameworksNetTests
Change-Id: Iae1935944214efaa8a21636c55e6d8be816275f7
Merged-In: Iae1935944214efaa8a21636c55e6d8be816275f7
2021-03-04 13:13:48 -08:00
James Mattis
3bf8b7a1b9
Applying OEM network pref to all users
...
Updating handleSetOemNetworkPreference so that the given policy is
applied to all users on the device. Additionally, remove uids for all
users/apps so that stale uids don't stay present after rematch. Finally,
small cleanup on how we deal with remote exceptions.
Bug: 181581017
Bug: 176494815
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk
Change-Id: I214717ee0c78cfe8322e551c2c2e9dc01c0242b2
2021-03-04 11:32:10 -08:00
Chalard Jean
fa970594c3
Merge changes Ide2567b2,I0ee0ce92,Iac3f55af am: f0717a9ffe am: 2a22bdeec6 am: e585766e12
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612257
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iffc8bf72312391e1d54c302d31b5b3cb25d1875e
2021-03-04 14:51:29 +00:00
Treehugger Robot
d86b902b36
Merge changes Ie8d98359,I4d5cadfd am: 63383e755e am: 044ef2ba4e am: 010f29032c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612254
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7700b4ed9dd9105beb947944d63138330d8c565e
2021-03-04 14:51:09 +00:00
Chalard Jean
e585766e12
Merge changes Ide2567b2,I0ee0ce92,Iac3f55af am: f0717a9ffe am: 2a22bdeec6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612257
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I28ac065b0574c94c8d8b0dfabaf15db0694b4f90
2021-03-04 13:46:18 +00:00
Treehugger Robot
010f29032c
Merge changes Ie8d98359,I4d5cadfd am: 63383e755e am: 044ef2ba4e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612254
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icbc9b89121bcb09fde41deb3f71322005b1ea2ed
2021-03-04 13:46:09 +00:00
Chalard Jean
2a22bdeec6
Merge changes Ide2567b2,I0ee0ce92,Iac3f55af am: f0717a9ffe
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612257
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic64d571ff8a1f2fdf6b15cde12c6b0a38b4a74b4
2021-03-04 13:18:57 +00:00
Treehugger Robot
044ef2ba4e
Merge changes Ie8d98359,I4d5cadfd am: 63383e755e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612254
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3ec456b2f2fd88648461794dc2301a3825c3c155
2021-03-04 13:16:29 +00:00
Chalard Jean
9a3a0eac07
Generalize some PANS methods
...
These methods will be reused for 5G slicing and should
have a more generic name/signature.
This is a no-op refactoring.
Test: FrameworksNetTests
Change-Id: I13cf9fc405fef7dc650d5ea7df44d025f6713b46
2021-03-04 22:15:27 +09:00
Remi NGUYEN VAN
2c6d33f451
Replace user with debuggable check in ConnectivityService
...
IS_USER is a hidden symbol, whereas IS_DEBUGGABLE is part
of the module API.
The check is generally equivalent, as non-user builds are eng or
userdebug, which are debuggable.
Bug: 170598012
Change-Id: I7d09939652844eb2e3a6f0200b1ba50691a147da
Test: atest FrameworksNetTests
2021-03-04 13:12:34 +00:00