Commit Graph

12626 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
d4232ce11a Merge changes from topic "ethernet_specifier" am: 92e9f17915 am: 7af6af880c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I772ca29f64cb9431a899a2c213c511ad467fc36f
2021-03-12 00:26:49 +00:00
Remi NGUYEN VAN
f9799d63a4 Add Ethernet, TestNetworkSpecifier API am: 7f11b46a43 am: f680bb763a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63159846579c43c721eeb86c9a55faa3f2888be8
2021-03-12 00:26:45 +00:00
Remi NGUYEN VAN
7af6af880c Merge changes from topic "ethernet_specifier" am: 92e9f17915
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ef1a287439b5f5705ff3b3b4de4ded54f61c1c1
2021-03-12 00:12:52 +00:00
Remi NGUYEN VAN
f680bb763a Add Ethernet, TestNetworkSpecifier API am: 7f11b46a43
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a1b38fb6b8b6831bac016a8352ae9073758f9af
2021-03-12 00:10:08 +00:00
Treehugger Robot
431f25a9da Merge changes Iac9487e8,Ifa411c7b am: 999506022f am: 007256389e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622675

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0742b4bb3c5b2ddaa06830b403d849ed25ef71cd
2021-03-12 00:04:56 +00:00
Remi NGUYEN VAN
92e9f17915 Merge changes from topic "ethernet_specifier"
* changes:
  Fix common tests on Q and R
  Add Ethernet, TestNetworkSpecifier API
2021-03-11 23:51:49 +00:00
Treehugger Robot
007256389e Merge changes Iac9487e8,Ifa411c7b am: 999506022f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622675

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cf126259f903d407830b1e8bc2d3fcdc02b97c2
2021-03-11 23:15:17 +00:00
Remi NGUYEN VAN
7f11b46a43 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
Merged-In: Iee569f5c8bbdc4bc979610e1191308281f3d4620

Change-Id: Iee569f5c8bbdc4bc979610e1191308281f3d4620
2021-03-11 23:02:02 +08:00
Remi NGUYEN VAN
5a6212753b 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
Merged-In: Iec8ef874a3ca6dcc65944bbbaa3575a5ae0f4989
Change-Id: Iec8ef874a3ca6dcc65944bbbaa3575a5ae0f4989
Test: atest CtsNetTestCasesLatestSdk
2021-03-11 23:02:02 +08:00
junyulai
f4bc12fe28 [VCN11] Make requestBackgroundNetwork requires handler
Test: atest FrameworksNetTests android.net.cts.ConnectivityManagerTest
Bug: 175662146
Change-Id: Iac9487e8de8bfdd87fc7a0153b228ae2a7ba4e19
2021-03-11 21:05:27 +08:00
junyulai
6b0a6a22a3 [VCN10] Add new API to listen for highest score network
Test: atest ConnectivityServiceTest#testRegisterBestMatchingNetworkCallback
Bug: 175662146
Change-Id: Ifa411c7b53da789c74fff7e1a95f9c9ebf5bd05c
2021-03-11 21:04:06 +08:00
Lorenzo Colitti
5d6c73b585 Merge "Don't start clatd if disabled by vendor property." am: 91fccfe42f am: 6abc4bec40
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I333fba0c9bca40f0cd60d042b4c6ed82e72abaa9
2021-03-11 12:55:46 +00:00
Lorenzo Colitti
6abc4bec40 Merge "Don't start clatd if disabled by vendor property." am: 91fccfe42f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e468f41424104a5e1d757e18bc5a8648c7f6d1d
2021-03-11 12:34:57 +00:00
Lorenzo Colitti
91fccfe42f Merge "Don't start clatd if disabled by vendor property." 2021-03-11 12:22:34 +00:00
Lorenzo Colitti
61aec97dc9 Merge "Unbreak extraInfo values returned to apps." am: 877ef7634f am: a035f85997
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624040

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99ea36c50a38dfc54b69ec5ad46d11d50e458925
2021-03-11 09:25:48 +00:00
Lorenzo Colitti
a035f85997 Merge "Unbreak extraInfo values returned to apps." am: 877ef7634f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624040

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6560b94331f477cd7ea9df3c8f766b1eec49dfa
2021-03-11 08:26:47 +00:00
Lorenzo Colitti
877ef7634f Merge "Unbreak extraInfo values returned to apps." 2021-03-11 08:06:03 +00:00
Lorenzo Colitti
3732b76a96 Merge "Set extraInfo on cellular TestNetworkAgents." am: ab2f3d3cb5 am: c612271990
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624039

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id194278af5a07dea4d0641c0884c46e77c931938
2021-03-11 04:33:28 +00:00
Lorenzo Colitti
c612271990 Merge "Set extraInfo on cellular TestNetworkAgents." am: ab2f3d3cb5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624039

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66af2cf6b6cd286993fa3328c5cc52d8bba3beb9
2021-03-11 03:57:11 +00:00
Lorenzo Colitti
ab2f3d3cb5 Merge "Set extraInfo on cellular TestNetworkAgents." 2021-03-11 03:31:49 +00:00
Aaron Huang
a100290e51 Merge "Remove IBatteryStats from ConnectivityService module" am: f3827cf444 am: 433b9738b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623262

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddff8e1ac79c589ddf34518b2e8f9627be25c550
2021-03-11 02:21:11 +00:00
Chiachang Wang
622c64b409 Merge "Remove hidden APIs usage regarding to dump" am: f4956c7502 am: 9ffb4d5e8b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4152e7cfdc14d4372319e66a67b117a94aedc80b
2021-03-11 02:19:33 +00:00
Aaron Huang
433b9738b3 Merge "Remove IBatteryStats from ConnectivityService module" am: f3827cf444
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623262

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb2e02126cfaf13360e23e43f6f15a8a8254121a
2021-03-11 02:17:59 +00:00
Aaron Huang
f3827cf444 Merge "Remove IBatteryStats from ConnectivityService module" 2021-03-11 02:04:41 +00:00
Chiachang Wang
9ffb4d5e8b Merge "Remove hidden APIs usage regarding to dump" am: f4956c7502
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95aa9931607301a61dfee801de32242f75528d0b
2021-03-11 02:03:11 +00:00
Chiachang Wang
f4956c7502 Merge "Remove hidden APIs usage regarding to dump" 2021-03-11 00:28:54 +00:00
Chiachang Wang
9ddf7d3c36 Remove hidden APIs usage regarding to dump
Classes inside the incoming connectivity module will not be able
to access hidden APIs. The hidden DUMP_FLAG_PRIORITY_* flags
usage should be replaced. It was used to control the dump
priority. DEFAULT priority for services which is treated the
same as NORMAL priority. ConnectivityServiceInitializer took
both NORMAL and HIGH. It trigger different information dumped.
It's replaced with dumpsys that does not send "--dump-priority"
arguments to the service. Thus, design is replaced with
local parsing inside ConnectivitySerivce to provide equivalent
dump.

Bug: 172183305
Test: m ; flash and boot up
Test: adb bugreport ; adb dumpsys connectivity
Change-Id: Ib3c9d8692eb4382cd106734a1a716df6f48ffca4
2021-03-11 00:28:47 +00:00
James Mattis
964b84a14d Merge "frameworks: add test group for auto tests" am: 5845859186 am: de47d2e4d1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595037

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72c3237b5dcd0e074f1bb0f327ee64fd21be5b28
2021-03-10 16:37:54 +00:00
Lorenzo Colitti
4c9e202a44 Don't start clatd if disabled by vendor property.
Fix: 182333299
Test: new unit tests
Change-Id: Ic15dc4fff6a13aa916e3d2dc6203829e96ddeda4
2021-03-11 00:59:14 +09:00
Lorenzo Colitti
386f9a3662 Unbreak extraInfo values returned to apps.
These were broken by aosp/1553463, which made filterNetworkInfo
unconditionally call setDetailedState with a reason of "" and an
extraInfo of null.

Fix both synchronous getter APIs (e.g., getNetworkInfo) and
CONNECTIVITY_ACTION broadcasts by calling a new
filterForLegacyLockdown method that behaves similarly to how the
now-deleted LockdownVpnTracker#augmentNetworkInfo used to behave.

While I'm at it, move back to private a method that was public
only because LockdownVpnTracker used it.

Fix: 181855958
Test: new unit test coverage
Change-Id: I2c7b88fcec9dd36b45cb51db8d19b3ee8bad44a6
2021-03-11 00:59:14 +09:00
James Mattis
de47d2e4d1 Merge "frameworks: add test group for auto tests" am: 5845859186
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595037

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7027594488771b408db82639fc6703c42beef186
2021-03-10 15:58:44 +00:00
James Mattis
5845859186 Merge "frameworks: add test group for auto tests" 2021-03-10 15:12:49 +00:00
Lorenzo Colitti
ad4e8837af Set extraInfo on cellular TestNetworkAgents.
This makes the test more realistic, since telephony always puts
the APN name in the extraInfo field. It also makes it easy to
test that various APIs properly return the extra info without
plumbing a new parameter through TestNetworkAgentWrapper,
NetworkAgentWrapper, and InstrumentedNetworkAgent.

Also make the extraInfo and the legacyType available to tests.
This will be used in future tests that assert the contents of
extraInfo.

Bug: 181855958
Test: test-only change
Change-Id: If4eddb6cd9e70bb33e10d72aceebaea843244246
2021-03-10 23:33:08 +09:00
Paul Hu
6ae3110de3 Merge "Replace PendingIntent#getIntent" am: e0b54f9303 am: c80147e92b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f4cb9ff8e42373e7ebf71b3d4559b768ebfdbe7
2021-03-10 04:32:26 +00:00
Paul Hu
c80147e92b Merge "Replace PendingIntent#getIntent" am: e0b54f9303
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e8256d6d33eb819904b8f972134bc4cd843e43f
2021-03-10 02:43:38 +00:00
Paul Hu
e0b54f9303 Merge "Replace PendingIntent#getIntent" 2021-03-10 02:13:11 +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
Jun
76df56c7e3 frameworks: add test group for auto tests
Adding a seperate test tag into postsubmit so as to identify which tests
we want to run for automotive builds.

Test: atest --test-mapping [src]:auto-postsubmit
bug: 179917339
Change-Id: I3860fb6bf4f4174fad26cce5f7d6b43fd6494c0f
2021-03-09 15:54:39 -08:00
Aaron Huang
c3f79207ef Remove IBatteryStats from ConnectivityService module
Currently ConnectivityService calls the methods in
BatteryStatsService through BatteryStatsManager so
IBatteryStats can be removed from ConnectivityService.

Bug: 171686421
Test: FrameworksNetTests
Change-Id: I559369c9900e8100cdae187bc9cec603ed85a131
2021-03-09 21:39:17 +08: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
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