Remi NGUYEN VAN
5babd4ec15
Fix common tests on Q and R
...
The common tests cannot reference EthernetNetworkSpecifier,
as it did not exist in Q and R yet.
Bug: 179329291
Change-Id: Iec8ef874a3ca6dcc65944bbbaa3575a5ae0f4989
Test: atest CtsNetTestCasesLatestSdk
2021-03-10 06:58:06 +00:00
Chalard Jean
26453b1683
Merge "Fix a bug where listen callbacks would not be called" am: 3b50ce7a6f am: d7e0f35a90 am: 5962bf322b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620900
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I216167c2809ddc12e4a92faedf3bb4dc5c1a56cb
2021-03-10 02:37:36 +00:00
Chalard Jean
5962bf322b
Merge "Fix a bug where listen callbacks would not be called" am: 3b50ce7a6f am: d7e0f35a90
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620900
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2edd1b12be6d2b1cb3c8bc4fdecd83364c813301
2021-03-10 01:46:40 +00:00
Chalard Jean
d7e0f35a90
Merge "Fix a bug where listen callbacks would not be called" am: 3b50ce7a6f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620900
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I14a640aa21b464e7d6ced3086986e0dd79eaa019
2021-03-10 01:07:50 +00:00
Chalard Jean
3b50ce7a6f
Merge "Fix a bug where listen callbacks would not be called"
2021-03-10 00:32:58 +00:00
Remi NGUYEN VAN
579c8c0126
Merge "Add Ethernet, TestNetworkSpecifier API" into sc-dev
2021-03-09 22:43:46 +00:00
Zoey Chen
38b5e98595
[automerger skipped] Merge changes from topic "PSL_TelephonyCallback" am: f619c9967d am: df270afdb6 am: 868044d483 -s ours
...
am skip reason: Change-Id Ia3b777b12142b104b5798804f50b34748f9bf28c with SHA-1 78ca2ba3a7 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614981
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifaaf86e06bbd93df2b0d5265df41e055f6be9bad
2021-03-09 12:32:52 +00:00
Aaron Huang
f8769c5cae
[automerger skipped] Merge changes I1d1f0d2d,Ifbd4a978 am: 77ed87e072 am: 9b58ed12cc am: 2314dd2d90 -s ours
...
am skip reason: Change-Id I1d1f0d2d456003e842ad77519667c0532995610d with SHA-1 dd92b6cf0d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idfc985eb18b73d11c07c084a32520b4661aef198
2021-03-09 12:32:10 +00:00
Zoey Chen
868044d483
Merge changes from topic "PSL_TelephonyCallback" am: f619c9967d am: df270afdb6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614981
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic26eea861f33d75b7b5ef62aa411532e52cac51b
2021-03-09 11:51:08 +00:00
Aaron Huang
2314dd2d90
Merge changes I1d1f0d2d,Ifbd4a978 am: 77ed87e072 am: 9b58ed12cc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7386dfb19911f1b9db39df3b809d18742cc13a75
2021-03-09 11:49:50 +00:00
Zoey Chen
df270afdb6
Merge changes from topic "PSL_TelephonyCallback" am: f619c9967d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614981
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idd41c34f9e4dff1ca7930a9fc2a6f06ec8c316ba
2021-03-09 11:24:06 +00:00
Aaron Huang
9b58ed12cc
Merge changes I1d1f0d2d,Ifbd4a978 am: 77ed87e072
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I156b9230ef2ea495a6d1661c3f618de4a9c2ac2a
2021-03-09 11:14:40 +00:00
Zoey Chen
f619c9967d
Merge changes from topic "PSL_TelephonyCallback"
...
* changes:
[Telephony] Use TelephonyCallback instead of PhoneStateListener part1
[PhoneStateListener] Redesign PhoneStateListener: Use TelephonyCallback
2021-03-09 10:36:03 +00:00
Aaron Huang
77ed87e072
Merge changes I1d1f0d2d,Ifbd4a978
...
* changes:
Communicate with BatteryStatsService through BatteryStatsManager
Add a new API in BatteryStatsManager for connectivity service
2021-03-09 10:33:56 +00:00
Chalard Jean
d67ab4df87
Fix a bug where listen callbacks would not be called
...
NetworkAgentInfos cache the list of requests they satisfy,
and that list is used to send callbacks. Therefore, when
the TRACK_DEFAULTs are copied, this list needs to be
updated.
The best way to do this is to figure out what was the old
active request and find which requests corresponds to it
in the new list, and then upon registering adding the
active request to the relevant satisfier if present.
A few other ways can be considered like replacing the
request as it gets added, but this would temporarily
increase the number of callbacks allocated to the app
and risks crashing it for no good reason ; furthermore
the call to remove would have to be eschewed somehow
for those requests that are replaced. This is much
simpler.
Test: new test for this. This also passes the future
tests for per-profile default network preference.
Change-Id: I001351e5c478c2c77cbf2844abca77b205291778
2021-03-09 19:05:55 +09:00
Chalard Jean
50403bba41
Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" am: aaef65de42 am: 3d4e6deeb3 am: 4ad3d649d8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615182
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2ae6ed673a8c82a7e6326c35c17508d26f2e5236
2021-03-09 08:52:01 +00:00
Chalard Jean
4ad3d649d8
Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" am: aaef65de42 am: 3d4e6deeb3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615182
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I242abe2597ad717026afc547f05701ed8c41aa5c
2021-03-09 08:26:04 +00:00
Chalard Jean
3d4e6deeb3
Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" am: aaef65de42
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615182
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I376927831333a78dc2c60b5be23324b8f0395c58
2021-03-09 08:07:32 +00:00
Remi NGUYEN VAN
6697878c6b
Add Ethernet, TestNetworkSpecifier API
...
Rename StringNetworkSpecifier to EthernetNetworkSpecifier (its only
production user), and make it module-lib API.
The original StringNetworkSpecifier file is actually kept to satisfy
some invalid dependencies; it will be removed separately.
This allows specifying an Ethernet interface with a non-deprecated API:
until this change the only way to do so would be to use
NetworkRequest#setSpecifier(String), which is deprecated.
Similarly, add the TestNetworkSpecifier API for TestNetworkManager, to
replace previous usage of StringNetworkSpecifier. TestNetworkManager is
module API, so TestNetworkSpecifier should be module API too. This
allows tests to request the test interface specifically, without using
the deprecated NetworkRequest#setSpecifier(String).
Bug: 179329291
Test: m
Change-Id: Iee569f5c8bbdc4bc979610e1191308281f3d4620
2021-03-09 07:46:48 +00:00
Chalard Jean
aaef65de42
Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity"
2021-03-09 07:41:13 +00:00
Lucas Lin
cdddf9d0b2
Merge "Use ArraySet#add() instead of ArraySet#append()" am: 627c6a5258 am: ee5644f6b5 am: d4185bab7a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615181
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic1cbcbb6f9dc83e664593b8e095a0f9b80697b83
2021-03-09 06:34:56 +00:00
Aaron Huang
e044c46257
Communicate with BatteryStatsService through BatteryStatsManager
...
Mainline connectivity service is only allowed to use formal
APIs. Use new system API in BatteryStatsManager instead of
calling BatteryStatsService directly.
Bug: 171686421
Test: FrameworksNetTests
Change-Id: I1d1f0d2d456003e842ad77519667c0532995610d
Merged-In: I1d1f0d2d456003e842ad77519667c0532995610d
2021-03-09 06:29:30 +00:00
Lucas Lin
d4185bab7a
Merge "Use ArraySet#add() instead of ArraySet#append()" am: 627c6a5258 am: ee5644f6b5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615181
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4418327b7201e31620a71b693a70403889a25fbf
2021-03-09 06:10:20 +00:00
Remi NGUYEN VAN
2389216cdb
Merge changes I1d1f0d2d,Ifbd4a978 into sc-dev
...
* changes:
Communicate with BatteryStatsService through BatteryStatsManager
Add a new API in BatteryStatsManager for connectivity service
2021-03-09 05:49:43 +00:00
Lucas Lin
ee5644f6b5
Merge "Use ArraySet#add() instead of ArraySet#append()" am: 627c6a5258
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615181
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1991567f130f3afee6c6bcb78a9254b45e14f6e4
2021-03-09 05:31:26 +00:00
Lucas Lin
627c6a5258
Merge "Use ArraySet#add() instead of ArraySet#append()"
2021-03-09 04:52:42 +00:00
Zoey Chen
dbc2df30cb
[Telephony] Use TelephonyCallback instead of PhoneStateListener part1
...
Since the redesign of PhoneStateListener, use TelephonyCallback to get the callback of EVENT_*
Bug: 167684594
Test: make
Change-Id: Ia3b777b12142b104b5798804f50b34748f9bf28c
Merged-In: Ia3b777b12142b104b5798804f50b34748f9bf28c
2021-03-08 20:25:00 +08:00
Remi NGUYEN VAN
b818bcc2e7
Merge "Move OemNetworkPreferences to Connectivity" am: c61a6fc426 am: 37aa459906 am: f2c45c31d3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620981
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I60a24c0fc878737e120414fe85786faacb425b09
2021-03-08 10:42:05 +00:00
Remi NGUYEN VAN
f2c45c31d3
Merge "Move OemNetworkPreferences to Connectivity" am: c61a6fc426 am: 37aa459906
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620981
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0f0c36460103552d1c1f21a8a5f8486274d282e2
2021-03-08 09:51:57 +00:00
Paul Hu
3cfe5b265c
Merge "Replace Inet[4|6]Address#ANY" am: 3483a8be68 am: cdb81da32c am: 7c62151de3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615184
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I33cb758506a4b2626de368c6537688245ac554e2
2021-03-08 09:16:20 +00:00
Remi NGUYEN VAN
37aa459906
Merge "Move OemNetworkPreferences to Connectivity" am: c61a6fc426
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620981
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9adc394b0c203cdb1045f50e83487ea0c2000632
2021-03-08 09:12:05 +00:00
Paul Hu
7c62151de3
Merge "Replace Inet[4|6]Address#ANY" am: 3483a8be68 am: cdb81da32c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615184
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9ee00807430cd27ed1632a0a6f7c78ab0ae4a99f
2021-03-08 08:51:15 +00:00
Remi NGUYEN VAN
c61a6fc426
Merge "Move OemNetworkPreferences to Connectivity"
2021-03-08 08:41:04 +00:00
Paul Hu
cdb81da32c
Merge "Replace Inet[4|6]Address#ANY" am: 3483a8be68
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615184
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I45cf2b37c775da158cdec2d3b7f50ac491d2fca8
2021-03-08 08:05:59 +00:00
Paul Hu
3483a8be68
Merge "Replace Inet[4|6]Address#ANY"
2021-03-08 07:20:21 +00:00
paulhu
ee4cd637e3
Replace Inet[4|6]Address#ANY
...
Connectivity is becoming a mainline module in S but mainline
modules are not allowed to use non-formal APIs. Thus, replace
non-formal API Inet[4|6]Address#ANY to
NetworkStackConstants#IPV[4|6]_ADDR_ANY.
Bug: 181756157
Test: FrameworksNetTests
Change-Id: Id4d2fc551c1384f549a586e87ab68356ba05b995
2021-03-08 07:18:31 +00:00
Aaron Huang
dd92b6cf0d
Communicate with BatteryStatsService through BatteryStatsManager
...
Mainline connectivity service is only allowed to use formal
APIs. Use new system API in BatteryStatsManager instead of
calling BatteryStatsService directly.
Bug: 171686421
Test: FrameworksNetTests
Change-Id: I1d1f0d2d456003e842ad77519667c0532995610d
2021-03-08 15:04:22 +08:00
Frank Li
c2e90a9f15
Merge "[CS10]Remove the hidden API usage of BitUtils" am: 02d57fc2ae am: defaaf05a4 am: 446fcf2ac9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615192
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad812431b5855e78596f861bd3b2c3ef091e3189
2021-03-08 03:34:25 +00:00
Frank Li
446fcf2ac9
Merge "[CS10]Remove the hidden API usage of BitUtils" am: 02d57fc2ae am: defaaf05a4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615192
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f8fe5b886c49a1c52fb4bf27d29347899e0dd21
2021-03-08 02:55:05 +00:00
Frank Li
defaaf05a4
Merge "[CS10]Remove the hidden API usage of BitUtils" am: 02d57fc2ae
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615192
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia0dcd92a896a759e65ada070f16394db216b07b8
2021-03-08 02:14:44 +00:00
Remi NGUYEN VAN
9930f13c67
Move OemNetworkPreferences to Connectivity
...
The data class supports a ConnectivityManager API, so it should be
together with the ConnectivityManager API surface.
Bug: 181512874
Test: m
Change-Id: I5642486ea0febcb08cadcbd4cd3f0c6056deae0e
2021-03-08 09:26:41 +09:00
lifr
c33ea4de7d
[CS10]Remove the hidden API usage of BitUtils
...
The connection service will become the main line module.
It is difficult to include BitUtils in the module. and so
Move the hidden API needed in BitUtils to NetworkCapabilitiesUtils.
Bug: 170598012
Test: atest ConnectivityServiceTest
atest NetworkCapabilitiesTest
atest DnsUtilsTest
Change-Id: Ibc81827e25a54fc3ff94f78d810fe4f5073e3a98
2021-03-06 16:21:16 +00:00
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