Commit Graph

13592 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
38f69a581d Merge "Fix common tests on Q and R" into sc-dev 2021-03-11 05:17:03 +00:00
Aaron Huang
0c39920728 Merge "Remove IBatteryStats from ConnectivityService module" am: f3827cf444 am: 433b9738b3 am: a100290e51
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623262

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I307d1c58558b08f7111aab91ed877937761b68a4
2021-03-11 03:05:52 +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
lifr
cc5af7e9ca [CS15]Do not use hidden API of PlatformProperties
ConnectivityService is going to become a mainline module, and
it will not able to use hidden method anymore. Using PlatformProperties
as a static library instead of hidden API.

Bug: 170917042
Test: atest FrameworksNetTests
Merged-In: I3a3deca5d2e0f690db8c0061de2db2217376d268
Change-Id: I3a3deca5d2e0f690db8c0061de2db2217376d268
2021-03-11 03:41:35 +08:00
James Mattis
ae464aa712 Merge "frameworks: add test group for auto tests" am: 5845859186 am: de47d2e4d1 am: 964b84a14d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595037

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8abe23381b488de352e2a35cb1de05b9d4a28bf
2021-03-10 17:17:45 +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
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
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
Paul Hu
fb2285f523 Merge "Replace PendingIntent#getIntent" am: e0b54f9303 am: c80147e92b am: 6ae3110de3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7d5fd57b053418db5e7a2cbd48f23945b350ccc
2021-03-10 05:17:31 +00:00
Aaron Huang
3a60a1bf16 Merge "Create a service-connectivity-pre-jarjar library" into sc-dev 2021-03-10 04:40:56 +00: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
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
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
Remi NGUYEN VAN
579c8c0126 Merge "Add Ethernet, TestNetworkSpecifier API" into sc-dev 2021-03-09 22:43:46 +00: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
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
paulhu
94c60a99c7 Replace PendingIntent#getIntent
Connectivity is becoming a mainline module in S but mainline
modules are not allowed to use non-formal APIs. Thus, replace
non-formal API PendingIntent#getIntent to new formal API
PendingIntent#intentFilterEquals.

Bug: 174237997
Test: FrameworksNetTests
Change-Id: Ic5e27f812bd42dbc80b9d29d81303df4dd5e8199
2021-03-09 05:43:05 +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