Commit Graph

12455 Commits

Author SHA1 Message Date
Lorenzo Colitti
309b66a983 Merge changes from topic "connectivity_jar_in_apex" am: e7ec916be5 am: cf0120bd86 am: 38ab8a08a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49964ba08c0983cd51fa06afe0be07a5c9bfaab1
2021-01-07 10:10:11 +00:00
Lorenzo Colitti
38ab8a08a5 Merge changes from topic "connectivity_jar_in_apex" am: e7ec916be5 am: cf0120bd86
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id85d632781cd8eb0850e919cd6bf990fca17f414
2021-01-07 09:49:51 +00:00
Lorenzo Colitti
cf0120bd86 Merge changes from topic "connectivity_jar_in_apex" am: e7ec916be5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ffdb3af42f1b37647a53f10d3a6e88bee17c335
2021-01-07 09:29:38 +00:00
Lorenzo Colitti
e7ec916be5 Merge changes from topic "connectivity_jar_in_apex"
* changes:
  Move service-connectivity to the tethering APEX
  Set setCurrentProxyScriptUrl as public
2021-01-07 08:34:25 +00:00
Chiachang Wang
1060f1cf15 Merge "Remove mobile provision design out from connectivity service" am: 243a8acbca am: 2b221892a1 am: 75fb6d4016
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531804

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5984ea716e87cfb1c4ec79d5c7edbf994dd4911f
2021-01-07 08:19:22 +00:00
Chiachang Wang
75fb6d4016 Merge "Remove mobile provision design out from connectivity service" am: 243a8acbca am: 2b221892a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531804

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0dac2bf826c3d28e9d8791c59764b5d30c83b861
2021-01-07 08:07:12 +00:00
Chiachang Wang
2b221892a1 Merge "Remove mobile provision design out from connectivity service" am: 243a8acbca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531804

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4ad2d91e5fdc740f0253b86977f9b63ba6c4b24
2021-01-07 07:13:04 +00:00
Chiachang Wang
243a8acbca Merge "Remove mobile provision design out from connectivity service" 2021-01-07 06:47:26 +00:00
Chiachang Wang
ce6dcc943e Remove mobile provision design out from connectivity service
In order to support ConnectivityService mainline, module should
not use hidden APIs. The logic to get mobile provision is moved
to telephony surface since it's only used by telephony.
Hence, remove the design out from Connectivity.

Bug: 175177794
Test: atest FrameworksNetTests
Change-Id: Ic3082fc1c4d7ac998f4e4cff1351e6829d500924
2021-01-07 06:46:40 +00:00
Lucas Lin
516b3a7ccb Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" am: 7a8259c987 am: 5069a406b0 am: 4b89bc0052
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537266

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52549a279f89639ac0132cd1bd1d2a830966eeac
2021-01-07 05:42:02 +00:00
Lucas Lin
4b89bc0052 Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" am: 7a8259c987 am: 5069a406b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537266

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50c09f6f06ea624a44353f0a7870bd500a387eca
2021-01-07 05:25:27 +00:00
Lucas Lin
5069a406b0 Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" am: 7a8259c987
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537266

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1af526cf485a659f96561c7e8e8f56d5eb84e56
2021-01-07 05:03:47 +00:00
Lucas Lin
7a8259c987 Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" 2021-01-07 04:32:54 +00:00
Paul Hu
c435b35e9f Merge "Replace INetworkPolicyManager to NetworkPolicyManager" am: 715827ca0a am: 19cb73eaa1 am: 9e47ac3e60
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534908

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6685f26e6f7c7d9b0da6edd147f1aa37e16d676
2021-01-07 03:41:23 +00:00
Paul Hu
9e47ac3e60 Merge "Replace INetworkPolicyManager to NetworkPolicyManager" am: 715827ca0a am: 19cb73eaa1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534908

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7526ca7f7185ba5ee024c4fb79a23c84086ece9
2021-01-07 03:22:58 +00:00
Remi NGUYEN VAN
da6a1fa661 Move service-connectivity to the tethering APEX
As part of modularization of ConnectivityService and expansion of the
Tethering module scope, move service-connectivity.jar into the tethering
APEX, and load it from there.

Bug: 171540887
Test: m, device boots and connectivity
Change-Id: Id7b6a4664ae73224b9ab219c94f56d603a62ee5a
2021-01-07 11:52:42 +09:00
Paul Hu
19cb73eaa1 Merge "Replace INetworkPolicyManager to NetworkPolicyManager" am: 715827ca0a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534908

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4faa3d8e8f437ec807c85aaff874852fd7d3cbb
2021-01-07 02:32:25 +00:00
Paul Hu
715827ca0a Merge "Replace INetworkPolicyManager to NetworkPolicyManager" 2021-01-07 02:08:58 +00:00
James Mattis
18a59f18f5 Merge "Update to Diagnostic Callback flows for multilayer" am: 829d6494fb am: dd0a2b3ed2 am: cd15bcfeca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510596

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58fea937ee7f785efe3ff36d4bc9cf506c87a3ff
2021-01-06 16:43:39 +00:00
James Mattis
cd15bcfeca Merge "Update to Diagnostic Callback flows for multilayer" am: 829d6494fb am: dd0a2b3ed2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510596

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3e2d2130c14af20fb422f6c7ebcccb36618dfac
2021-01-06 16:08:25 +00:00
James Mattis
dd0a2b3ed2 Merge "Update to Diagnostic Callback flows for multilayer" am: 829d6494fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510596

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2eb635ce32e4df1d0d0e78ff7398790d2f3fdc7e
2021-01-06 15:45:01 +00:00
James Mattis
829d6494fb Merge "Update to Diagnostic Callback flows for multilayer" 2021-01-06 15:25:56 +00:00
Lorenzo Colitti
afff39ff53 [automerger skipped] Merge "Migrate away from AsyncChannel in NetworkAgent" am: abf3317103 am: 9156ffa5a5 am: bd646b30c1 -s ours
am skip reason: Change-Id Ie364ab50f416e7821e70f4539a881eea828e1256 with SHA-1 37ebfa827a is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie47420e86dfe4aec19162545116023c9da75aa14
2021-01-06 15:22:38 +00:00
Lorenzo Colitti
bd646b30c1 Merge "Migrate away from AsyncChannel in NetworkAgent" am: abf3317103 am: 9156ffa5a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7aa23752ed86096651e122b8497180052fa16337
2021-01-06 14:44:24 +00:00
Lorenzo Colitti
9156ffa5a5 Merge "Migrate away from AsyncChannel in NetworkAgent" am: abf3317103
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29a9073fcd69953811d899d3b421624d21a81edb
2021-01-06 14:26:23 +00:00
Lorenzo Colitti
abf3317103 Merge "Migrate away from AsyncChannel in NetworkAgent" 2021-01-06 14:10:21 +00:00
paulhu
7121b5ef72 Replace INetworkPolicyManager to NetworkPolicyManager
Connectivity service is going to become a mainline module which
will not able to access hidden APIs. Thus, use formal API
Context#getSystemService() to get network policy service instead
of hidden API ServiceManager#getService().

Bug: 170598012
Test: atest FrameworksNetTests FrameworksNetIntegrationTests
Change-Id: I4f286264b5800b2b922f85a76ddd20d64d53000a
2021-01-05 17:47:25 +08:00
James Mattis
65d0d1c03f Update to Diagnostic Callback flows for multilayer
Updates to ConnectivityDiagnosticsCallback flows that directly accessed
the NRI 'request' member to now instead use mRequests. This will be done
by first not allowing multilayer requests on registration of a
connectivity diagnostic and then accessing the '0' index of mRequests.

Bug: 174187714
Bug: 171991028
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: Ida98036b70fa290a214ee23236bfd0aad08e90a3
2020-12-31 15:52:06 -08:00
Paul Hu
cd73ec04a4 Merge "Use system API to obtain IDnsResolver IBinder" am: 1caeb0322a am: 89de26e233 am: 4c0cc156c5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9effd15dcb8a6d51ee3920427a80b776da9bf885
2020-12-30 08:03:47 +00:00
Paul Hu
4c0cc156c5 Merge "Use system API to obtain IDnsResolver IBinder" am: 1caeb0322a am: 89de26e233
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1352dd2276585cbacb48dbe952c4f90b0e4a2e5
2020-12-30 07:32:47 +00:00
Paul Hu
89de26e233 Merge "Use system API to obtain IDnsResolver IBinder" am: 1caeb0322a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03c6112d13adfc26ba236133be70b1116778cd6e
2020-12-30 06:50:00 +00:00
Paul Hu
1caeb0322a Merge "Use system API to obtain IDnsResolver IBinder" 2020-12-30 06:35:05 +00:00
lucaslin
ad369e30b7 Replace withCleanCallingIdentity with [clear|restore]CallingIdentity
To prevent using @hide method - withCleanCallingIdentity() from
mainline module, use clearCallingIdentity() &
restoreCallingIdentity() instead.

Bug: 172183305
Test: FrameworksNetTests, CtsNetTestCasesLatestSdk
Change-Id: Iccd492741a0a5b1c2531fc5fc1378933b65ae038
2020-12-30 11:54:55 +08:00
Junyu Lai
0310fc1f60 Merge "Add test for increment operation count on non-default network" am: 20f05ed023 am: 7933522fbf am: 730e15b8d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53607908e07f8c7c94e1c2ac8632ebb645ea469a
2020-12-28 10:01:46 +00:00
Junyu Lai
730e15b8d6 Merge "Add test for increment operation count on non-default network" am: 20f05ed023 am: 7933522fbf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If52e015750ffe1efc4b584b6ef47db240cd8d187
2020-12-28 09:47:56 +00:00
Junyu Lai
7933522fbf Merge "Add test for increment operation count on non-default network" am: 20f05ed023
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5418322817339172b8b41aab131a590583d4dfc
2020-12-28 09:02:31 +00:00
Junyu Lai
20f05ed023 Merge "Add test for increment operation count on non-default network" 2020-12-28 08:16:44 +00:00
Chiachang Wang
629e586bff Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged" am: 6b674eea72 am: 3fa134a3f8 am: 1db2093644
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I992dd2f78c0f7334bbe97a03faba161d09a03a71
2020-12-28 02:32:19 +00:00
Chiachang Wang
1db2093644 Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged" am: 6b674eea72 am: 3fa134a3f8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e255f46fc8b3d9fb3f4e1af4bd66b4a0e38369e
2020-12-28 02:02:08 +00:00
Chiachang Wang
3fa134a3f8 Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged" am: 6b674eea72
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I579829d0a152de56ce23ec15aa8a8f26538a9de7
2020-12-28 01:47:44 +00:00
Chiachang Wang
6b674eea72 Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged" 2020-12-28 01:05:28 +00:00
Serik Beketayev
20754ee85c Merge "[Mainline] Migrate ProxyInfo" am: ea935361d5 am: 872ac951cc am: a12940d1ca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6f5bf74bf461f762472ea1d88553db3b9719c80
2020-12-25 09:58:40 +00:00
Serik Beketayev
a12940d1ca Merge "[Mainline] Migrate ProxyInfo" am: ea935361d5 am: 872ac951cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica0e0965296e3bf843fa73fc6d687da6a9ae721d
2020-12-25 09:45:54 +00:00
Serik Beketayev
872ac951cc Merge "[Mainline] Migrate ProxyInfo" am: ea935361d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic839f183b48279532dcfb484818457a5372087b2
2020-12-25 09:21:03 +00:00
Serik Beketayev
ea935361d5 Merge "[Mainline] Migrate ProxyInfo" 2020-12-25 08:32:04 +00:00
Remi NGUYEN VAN
96be83bccb Migrate away from AsyncChannel in NetworkAgent
Use two oneway binder interfaces instead.
The interfaces post messages to handlers as was implemented before, but
provide a more strictly defined interface, with less hops between
NetworkAgent, AsyncChannel, and ConnectivityService.

The actual public interface is the NetworkAgent @SystemApi: the binder
interface is an internal implementation detail.

Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Bug: 173574274
Merged-In: Ie364ab50f416e7821e70f4539a881eea828e1256

Change-Id: Ie364ab50f416e7821e70f4539a881eea828e1256
2020-12-25 03:54:19 +00:00
Remi NGUYEN VAN
4f9da57398 Merge "Migrate away from AsyncChannel in NetworkAgent" 2020-12-25 01:57:44 +00:00
Sudheer Shanka
49305f5625 Merge "Update usage of allowlist/denylist in some method names/comments." am: e1dc77b743 am: f316b89f93 am: fa2f9f4eee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402789

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40b28e3be169fbc59f8b889871ed938b45de2fab
2020-12-24 09:50:20 +00:00
Sudheer Shanka
fa2f9f4eee Merge "Update usage of allowlist/denylist in some method names/comments." am: e1dc77b743 am: f316b89f93
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402789

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97e8af4a71f23438e830b1a44834719b7c488d67
2020-12-24 09:36:33 +00:00
Sudheer Shanka
f316b89f93 Merge "Update usage of allowlist/denylist in some method names/comments." am: e1dc77b743
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402789

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d6e7220d742e38bd153916a95e43d5de0da830e
2020-12-24 08:40:56 +00:00