Commit graph

13,045 commits

Message SHA1
Merge "Replace the way to add legacy routing" am: e94bf1bc3c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490244

Change-Id: I6a278e3ae1ac4f5eaba92d28edf4a53d5381832e

Chiachang Wang   authored and   Automerger Merge Worker   commited 2020-11-11 05:23:20 +00:00
1b1c460be6
Merge "Replace the way to add legacy routing"
Chiachang Wang   authored and   Gerrit Code Review   commited 2020-11-11 05:06:58 +00:00
e94bf1bc3c
Merge "Updating network preference comments" am: 5aff64e718 am: c22a6a5cd0 am: 25dfe8eb37
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490233

Change-Id: I2cd6b804cdadfce11d298c32a29ba0c1f9820209

James Mattis   authored and   Automerger Merge Worker   commited 2020-11-10 19:33:34 +00:00
f2ba675a29
Merge "Updating network preference comments" am: 5aff64e718 am: c22a6a5cd0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490233

Change-Id: I6e73148769cc20edc1fa26ebd211472d46877ed0

James Mattis   authored and   Automerger Merge Worker   commited 2020-11-10 19:13:56 +00:00
25dfe8eb37
Merge "Updating network preference comments" am: 5aff64e718
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490233

Change-Id: I99561b2d7673c5f5f45ac793c453b4f10bd663e1

James Mattis   authored and   Automerger Merge Worker   commited 2020-11-10 18:35:28 +00:00
c22a6a5cd0
Merge "Updating network preference comments"
James Mattis   authored and   Gerrit Code Review   commited 2020-11-10 17:30:36 +00:00
5aff64e718
Fix the comments left on aosp/1481197
Bug: 172040168
Test: atest FrameworksNetTests
Test: Manual test NO_INTERNET, SIGN_IN, PARTIAL_CONNECTIVITY,
      VPN_ALWAYS_ON notifications.
Change-Id: Ibd05366481e6ddadf8b323335c2c35d40d340d0d

lucaslin   commited 2020-11-10 14:54:52 +08:00
684a06de6d
Replace the way to add legacy routing
ConnectivityService is going to become a mainline module which
is not able to access hidden API. Thus, replace the usage from
NMS to INetd.

Bug: 170598012
Test: atest FrameworksNetTests ConnectivityManagerLegacyTest
Change-Id: Ice1bd1effab26555917bc1766354aeaebd41ad66

Chiachang Wang   commited 2020-11-10 14:53:55 +08:00
fd3fa0a549
Merge changes I67e5fa23,I223b207c am: 3ae04504d6 am: 3d4fd4e946 am: b2b8dc920d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483969

Change-Id: I7acb1ccf4ff3d3d16863c08e1fee407b69427d54

Lucas Lin   authored and   Automerger Merge Worker   commited 2020-11-10 06:50:50 +00:00
ece8c4b0ab
Merge changes I67e5fa23,I223b207c am: 3ae04504d6 am: 3d4fd4e946
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483969

Change-Id: Idc58f24797aa1e3d24058a024b1ea31199f46353

Lucas Lin   authored and   Automerger Merge Worker   commited 2020-11-10 06:09:03 +00:00
b2b8dc920d
Merge changes I67e5fa23,I223b207c am: 3ae04504d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483969

Change-Id: I74209eccb2fd5473d65968f765f3eb54ee99954e

Lucas Lin   authored and   Automerger Merge Worker   commited 2020-11-10 05:47:18 +00:00
3d4fd4e946
Merge changes I67e5fa23,I223b207c
* changes:
  Use hasIpv[4|6]DefaultRoute instead of hasIPv[4|6]DefaultRoute
  Use local defined constants for notification channels

Lucas Lin   authored and   Gerrit Code Review   commited 2020-11-10 05:28:33 +00:00
3ae04504d6
Updating network preference comments
Updating comments for network preferences to better clarify that
preferences which include more than one network type will then rely on
scoring to determine which of those networks are chosen.

Bug: 171795464
Test: atest FrameworksNetTests
Change-Id: I9eb5683f2cd69281bbee9fb70028d45f07720914

James Mattis   commited 2020-11-09 21:06:09 -08:00
dce028e5b5
[automerger skipped] Merge "Add maxTargetSdk restriction to unused APIs." am: d04f969c9d am: 96d3ff7659 am: a6e533d62a -s ours
am skip reason: Change-Id I626caf7c1fe46c5ab1f39c2895b42a34319f771a with SHA-1 d771d6e94d is in history

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

Change-Id: I121b7837c0d2a65bb2a8d264c7f92c2a477def67

Mathew Inwood   authored and   Automerger Merge Worker   commited 2020-11-09 15:59:31 +00:00
72b5226810
Merge "Add maxTargetSdk restriction to unused APIs." am: d04f969c9d am: 96d3ff7659
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1468245

Change-Id: I60222cb1879651cf283e385519b5c4d156ab68a1

Mathew Inwood   authored and   Automerger Merge Worker   commited 2020-11-09 15:24:20 +00:00
a6e533d62a
Merge "Add maxTargetSdk restriction to unused APIs." am: d04f969c9d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1468245

Change-Id: I35f65987f7f9287cf03418e9feb27c81f4fd1878

Mathew Inwood   authored and   Automerger Merge Worker   commited 2020-11-09 15:09:11 +00:00
96d3ff7659
Merge "Add maxTargetSdk restriction to unused APIs."
Mathew Inwood   authored and   Gerrit Code Review   commited 2020-11-09 14:41:20 +00:00
d04f969c9d
Merge "Adding API stubs for application network routing" am: 20a9e59e25 am: d8cf074a43 am: decb412854
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478963

Change-Id: I22f8b7b15a0bc7643474f5119dd34cdddf5a8376

James Mattis   authored and   Automerger Merge Worker   commited 2020-11-06 19:19:46 +00:00
105e23cb53
Merge "Adding API stubs for application network routing" am: 20a9e59e25 am: d8cf074a43
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478963

Change-Id: I7001e39dc59a509f10d7851cd9688b7b98ce0b95

James Mattis   authored and   Automerger Merge Worker   commited 2020-11-06 19:05:22 +00:00
decb412854
Merge "Adding API stubs for application network routing" am: 20a9e59e25
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478963

Change-Id: I293192102c800a9dd8f09c32f890728e802cc965

James Mattis   authored and   Automerger Merge Worker   commited 2020-11-06 17:32:56 +00:00
d8cf074a43
Remove unused getTetherStats
Before Android R, getTetherStats were used to collect tethering
iface stats of all clients who extends ITetheringStatsProvider,
which typically contains NetdTetheringStatsProvider and
OffloadController.

However, this always returns 0 since Android R, because:
  1. OffloadController implemented NetworkStatsProvider and no
     longer reports stats through getTetherStats.
  2. NetdTetheringStatsProvider always return 0 by design since
     non-offloaded iface tethering stats are already included
     in native iface stats.

This change is a no-op refactoring to remove unused
getTetherStats and update test which is not pratical.
Fix for offloaded tethering stats will be in follow-up CLs.

Test: atest FrameworksNetTests TetheringTests
Bug: 162292214
Change-Id: Icd0717c5c2807ae3bd98626b897e4b148f142815

junyulai   commited 2020-11-06 19:02:44 +08:00
10b443adbb
Adding API stubs for application network routing
Bug: 171795464
Test: atest FrameworksNetTests
Change-Id: Ib055aa37a7bf0c48c335307afc2258aa869c4267

James Mattis   commited 2020-11-06 00:08:13 -08:00
dcea9fb2d4
Merge "Adding multilayered requests to NetworkRequestInfo" am: f2c37de2ba am: a5bd693f29 am: bd74d7c875
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486199

Change-Id: I8ce428771882b8f2e2e904ebba18acdf7be2a056

James Mattis   authored and   Automerger Merge Worker   commited 2020-11-06 06:03:37 +00:00
ab87d08537
Merge "Adding multilayered requests to NetworkRequestInfo" am: f2c37de2ba am: a5bd693f29
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486199

Change-Id: I3d013dc1a3caf9c41fbc835f2eb92df4e40bed33

James Mattis   authored and   Automerger Merge Worker   commited 2020-11-06 05:47:26 +00:00
bd74d7c875
Merge "Adding multilayered requests to NetworkRequestInfo" am: f2c37de2ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486199

Change-Id: I57d85884e4bf6039cf645ed58e2c7b0c8fd404a2

James Mattis   authored and   Automerger Merge Worker   commited 2020-11-06 05:19:47 +00:00
a5bd693f29
Adding multilayered requests to NetworkRequestInfo
Updating NetworkRequestInfo for "multilayered requests" functionality so that
requests can support a network hierarchy. I.e., requests network
with capability A first and if not available, request network with
capability B. This CL is the first step in adding that support by
updating the request object from a single request to a collection.

Bug: 171991028
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I64a124802986e4cf4aa7de158c6690fdf9851cb2

James Mattis   commited 2020-11-05 13:55:50 -08:00
7835f74bac
Merge "Replace Context @hide APIs" am: f021a81854 am: 8fabfb25c3 am: fe50f2ab24
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458063

Change-Id: Ib4aae2fd7eebd700928edc2c715df8de90b428a7

Paul Hu   authored and   Automerger Merge Worker   commited 2020-11-05 09:38:40 +00:00
bbc5a2473f
Merge "Replace AppOpsManager @hide APIs" am: 12e9b2ecb5 am: 0631c7bc98 am: 35e3902531
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469126

Change-Id: If33de767f397797a104bf2030ac4ca5f8928359f

Paul Hu   authored and   Automerger Merge Worker   commited 2020-11-05 09:38:29 +00:00
c34ced274a
Merge "Replace Context @hide APIs" am: f021a81854 am: 8fabfb25c3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458063

Change-Id: Iea56458847be39665e7660f048eec88147be27c3

Paul Hu   authored and   Automerger Merge Worker   commited 2020-11-05 09:14:59 +00:00
fe50f2ab24
Merge "Replace AppOpsManager @hide APIs" am: 12e9b2ecb5 am: 0631c7bc98
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469126

Change-Id: I9548c666d528e025b71f5d3b12b0c5ff2265eb23

Paul Hu   authored and   Automerger Merge Worker   commited 2020-11-05 09:14:46 +00:00
35e3902531
Merge "Replace Context @hide APIs" am: f021a81854
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458063

Change-Id: I914ee12abdcba7c53fb868425592d6458a797e23

Paul Hu   authored and   Automerger Merge Worker   commited 2020-11-05 08:53:01 +00:00
8fabfb25c3
Merge "Replace AppOpsManager @hide APIs" am: 12e9b2ecb5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469126

Change-Id: I6222db7e8f966d7df17de9c46b5e26e715ecccf2

Paul Hu   authored and   Automerger Merge Worker   commited 2020-11-05 08:45:52 +00:00
0631c7bc98
Merge "Replace Context @hide APIs"
Paul Hu   authored and   Gerrit Code Review   commited 2020-11-05 08:05:09 +00:00
f021a81854
Merge "Replace AppOpsManager @hide APIs"
Paul Hu   authored and   Gerrit Code Review   commited 2020-11-05 08:03:55 +00:00
12e9b2ecb5
Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82 am: b15efe2545 am: 57675a19e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487452

Change-Id: I49522105e82ee2d63fd84f7ab56fb3e11d87b5c7

James Mattis   authored and   Automerger Merge Worker   commited 2020-11-05 06:00:08 +00:00
4349a76d6f
Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82 am: b15efe2545
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487452

Change-Id: Ic5b96ccbba713327c70a62ba584129ab20f35db6

James Mattis   authored and   Automerger Merge Worker   commited 2020-11-05 05:49:10 +00:00
57675a19e0
Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487452

Change-Id: I92bd7437dede4ae4a4bb27dfbf68a5ae74553811

James Mattis   authored and   Automerger Merge Worker   commited 2020-11-05 05:24:33 +00:00
b15efe2545
Adding @IgnoreUpTo for testOemPrivate
Adding @IgnoreUpTo for NetworkCapabilitiesTest.testOemPrivate so that
this test can run on previous releases.

Bug: 172400600
Bug: 171505922
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest
Change-Id: Ibc728c986ad6faeed78c631ca2675956b95c6ac1

James Mattis   commited 2020-11-04 16:52:11 -08:00
082528f4b6
DO NOT MERGE: Introduce DPMS shim for active DO/PO check am: 5c91bdecce am: 84ca530ba7 am: 262771be94
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I76bfbffc3485cd07675ffc8c8c64f11a8a7d5d03

Eran Messeri   authored and   Automerger Merge Worker   commited 2020-11-04 13:00:13 +00:00
c82f075f92
DO NOT MERGE: Introduce DPMS shim for active DO/PO check am: 5c91bdecce am: 84ca530ba7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I467120ce7e419a75749efac109609bb30cc35eff

Eran Messeri   authored and   Automerger Merge Worker   commited 2020-11-04 12:46:45 +00:00
262771be94
DO NOT MERGE: Introduce DPMS shim for active DO/PO check am: 5c91bdecce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I79e090d92c5bf17993f8e4f710581675eb72f2a9

Eran Messeri   authored and   Automerger Merge Worker   commited 2020-11-04 12:24:40 +00:00
84ca530ba7
DO NOT MERGE: Introduce DPMS shim for active DO/PO check
Introduce a shim into DevicePolicyManagerInternal &
DevicePolicyManagerService so that NetworkStatsAccessTest would not
diverge from internal development branches.

The DevicePolicyManagerService refactoring on the internal branch
removed isActiveAdminWithPolicy in favour of isActiveDeviceOwner and
isActiveProfileOwner.

These methods are being made available in AOSP for
NetworkStatsAccessTest.

Bug: 170459325
Test: atest NetworkStatsAccessTest
Change-Id: Ic7e0898989fb8222aaba2b35436765c04eb3250c

Eran Messeri   commited 2020-11-04 10:07:06 +00:00
5c91bdecce
Add maxTargetSdk restriction to unused APIs.
These are APIs that have @UnsupportedAppUsage but for which we don't
have any evidence of them currently being used, so should be safe to
remove from the unsupported list.

Bug: 170729553
Test: Treehugger
Merged-In: I626caf7c1fe46c5ab1f39c2895b42a34319f771a
Change-Id: I54e5ecd11e76ca1de3c5893e3a98b0108e735413

Mathew Inwood   commited 2020-11-04 09:45:53 +00:00
5a09a71012
Use hasIpv[4|6]DefaultRoute instead of hasIPv[4|6]DefaultRoute
ConnectivityService is going to be a mainline module, it can only
use formal APIs or @SystemApi. So use @SystemApi
hasIpv4DefaultRoute and hasIpv6DefaultRoute instead of
hasIPv4DefaultRoute and hasIPv6DefaultRoute.

Bug: 172183305
Test: atest FrameworksNetTests
Change-Id: I67e5fa234fbb6d0b9739ae3295eb0b0ea108f582

lucaslin   authored and   Lucas Lin   commited 2020-11-04 01:29:53 +00:00
62bc2b0f24
Replace Context @hide APIs
Connectivity service module is using some Context @hide APIs but
they are not able to call after CS becomes a mainline module.
Thus, replace them with similar System APIs.

Bug: 170593746
Test: atest FrameworksNetTests
Test: Manully check that receiving intent and starting activity
      can work normally.
Change-Id: I0f5b53ce0da4e3fc0f927896e9a9e444048401bd

paulhu   commited 2020-11-04 00:02:42 +08:00
fa229ae8a5
Replace AppOpsManager @hide APIs
Connectivity service module is using some AppOpsManager @hide
APIs but they are not able to call after CS become a
mainline module. Thus, replace them with similar System APIs.

Bug: 170593746
Test: atest FrameworksNetTests
Change-Id: I51f66b64fcc3ebdbc2fddff8371eb8d9ff134137

paulhu   commited 2020-11-03 22:27:16 +08:00
1c15b17d78
Add maxTargetSdk restriction to unused APIs.
These are APIs that have @UnsupportedAppUsage but for which we don't
have any evidence of them currently being used, so should be safe to
remove from the unsupported list.

Bug: 170729553
Test: Treehugger
Merged-In: I8285daa8530260251ecad6f3f38f98e263629ca7
Change-Id: I626caf7c1fe46c5ab1f39c2895b42a34319f771a

Mathew Inwood   commited 2020-11-02 10:30:09 +00:00
d771d6e94d
Use local defined constants for notification channels
ConnectivityService mainline module cannot call the members
inside SystemNotificationChannels.java. So use the local defined
constants instead.

Bug: 172040168
Test: atest FrameworksNetTests
Test: Manual test NO_INTERNET, SIGN_IN, PARTIAL_CONNECTIVITY,
      VPN_ALWAYS_ON notifications.
Change-Id: I223b207c4346e8239dee78e50dd2b0532a3e55b0

lucaslin   commited 2020-11-02 11:53:16 +08:00
3bd1f6f004
Merge "NetworkNotificationManager gets NotificationManager locally" am: a13966feea am: d0034c56c1 am: 0776d454a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459882

Change-Id: Ib457623c1d204f8b83918a13c662335b4b9aded0

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-10-30 11:25:49 +00:00
29001506d8
Merge "NetworkNotificationManager gets NotificationManager locally" am: a13966feea am: d0034c56c1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459882

Change-Id: I3663ea2b95ec7815e84fa0729c39591280a90847

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-10-30 11:15:15 +00:00
0776d454a2