Commit Graph

12018 Commits

Author SHA1 Message Date
Chiachang Wang
2628efa2db Merge "Move BasicShellCommandHandler to frameworks/lib/modules-utils" 2020-11-12 05:08:48 +00:00
Chiachang Wang
a636262ced Merge "Replace the way to add legacy routing" am: e94bf1bc3c am: 1b1c460be6 am: e7ef9769d1 am: c2a352ecef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490244

Change-Id: Ibf3ef520e841a065225b15992fb924ada58ea828
2020-11-11 06:44:07 +00:00
Chiachang Wang
c2a352ecef Merge "Replace the way to add legacy routing" am: e94bf1bc3c am: 1b1c460be6 am: e7ef9769d1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490244

Change-Id: Ie6fee224b995af4ace0b74a5508e21f1e008ba0b
2020-11-11 06:14:25 +00:00
Chiachang Wang
e7ef9769d1 Merge "Replace the way to add legacy routing" am: e94bf1bc3c am: 1b1c460be6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490244

Change-Id: I363c642663877d7ac521f8e9d5729040deca7f9a
2020-11-11 05:57:28 +00:00
Chiachang Wang
1b1c460be6 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
2020-11-11 05:23:20 +00:00
Chiachang Wang
e94bf1bc3c Merge "Replace the way to add legacy routing" 2020-11-11 05:06:58 +00:00
James Mattis
d40282e0be Merge "Updating network preference comments" am: 5aff64e718 am: c22a6a5cd0 am: 25dfe8eb37 am: f2ba675a29
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490233

Change-Id: Ic1b025dd4598c211a3b9c5065e034b4cc001dc99
2020-11-10 19:57:53 +00:00
James Mattis
f2ba675a29 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
2020-11-10 19:33:34 +00:00
James Mattis
25dfe8eb37 Merge "Updating network preference comments" am: 5aff64e718 am: c22a6a5cd0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490233

Change-Id: I6e73148769cc20edc1fa26ebd211472d46877ed0
2020-11-10 19:13:56 +00:00
James Mattis
c22a6a5cd0 Merge "Updating network preference comments" am: 5aff64e718
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490233

Change-Id: I99561b2d7673c5f5f45ac793c453b4f10bd663e1
2020-11-10 18:35:28 +00:00
Lucas Lin
c970b724ce Merge changes I67e5fa23,I223b207c am: 3ae04504d6 am: 3d4fd4e946 am: b2b8dc920d am: ece8c4b0ab
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483969

Change-Id: I9d4fd09d4dbd017b416eb0e93a8ea5670076bdda
2020-11-10 18:06:23 +00:00
James Mattis
5aff64e718 Merge "Updating network preference comments" 2020-11-10 17:30:36 +00:00
Chiachang Wang
fd3fa0a549 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
2020-11-10 14:53:55 +08:00
Lucas Lin
ece8c4b0ab 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
2020-11-10 06:50:50 +00:00
Lucas Lin
b2b8dc920d Merge changes I67e5fa23,I223b207c am: 3ae04504d6 am: 3d4fd4e946
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483969

Change-Id: Idc58f24797aa1e3d24058a024b1ea31199f46353
2020-11-10 06:09:03 +00:00
Lucas Lin
3d4fd4e946 Merge changes I67e5fa23,I223b207c am: 3ae04504d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483969

Change-Id: I74209eccb2fd5473d65968f765f3eb54ee99954e
2020-11-10 05:47:18 +00:00
Lucas Lin
3ae04504d6 Merge changes I67e5fa23,I223b207c
* changes:
  Use hasIpv[4|6]DefaultRoute instead of hasIPv[4|6]DefaultRoute
  Use local defined constants for notification channels
2020-11-10 05:28:33 +00:00
James Mattis
dce028e5b5 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
2020-11-09 21:06:09 -08:00
Chiachang Wang
5eb17941e9 Move BasicShellCommandHandler to frameworks/lib/modules-utils
BasicShellCommandHandler is used by mainline modules and the
framwork. There is a new repo that was created for putting
this kind of utility class. Move BasicShellCommandHandler for
the incoming ConnectivityService mainline and updating the
related usage.

Bug: 170598012
Test: m ; verify with adb shell cmd
Change-Id: I8a2873df6e7d8342b7a8b466bda155f74c807ee3
2020-11-10 09:54:14 +08:00
Mathew Inwood
c9e5d3befe [automerger skipped] Merge "Add maxTargetSdk restriction to unused APIs." am: d04f969c9d am: 96d3ff7659 am: a6e533d62a -s ours am: 72b5226810 -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: Ie7a69520ba03c3454455d1fe0d0daf95d12840ed
2020-11-09 16:32:35 +00:00
Mathew Inwood
72b5226810 [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
2020-11-09 15:59:31 +00:00
Mathew Inwood
a6e533d62a 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
2020-11-09 15:24:20 +00:00
Mathew Inwood
96d3ff7659 Merge "Add maxTargetSdk restriction to unused APIs." am: d04f969c9d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1468245

Change-Id: I35f65987f7f9287cf03418e9feb27c81f4fd1878
2020-11-09 15:09:11 +00:00
Mathew Inwood
d04f969c9d Merge "Add maxTargetSdk restriction to unused APIs." 2020-11-09 14:41:20 +00:00
James Mattis
1551219663 Merge "Adding API stubs for application network routing" am: 20a9e59e25 am: d8cf074a43 am: decb412854 am: 105e23cb53
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478963

Change-Id: Icb5f6e6124d23093ff7051d27d2fd4b9e3a1f72c
2020-11-06 19:40:05 +00:00
James Mattis
105e23cb53 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
2020-11-06 19:19:46 +00:00
James Mattis
decb412854 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
2020-11-06 19:05:22 +00:00
James Mattis
d8cf074a43 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
2020-11-06 17:32:56 +00:00
James Mattis
dcea9fb2d4 Adding API stubs for application network routing
Bug: 171795464
Test: atest FrameworksNetTests
Change-Id: Ib055aa37a7bf0c48c335307afc2258aa869c4267
2020-11-06 00:08:13 -08:00
James Mattis
9797451b78 Merge "Adding multilayered requests to NetworkRequestInfo" am: f2c37de2ba am: a5bd693f29 am: bd74d7c875 am: ab87d08537
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486199

Change-Id: I1baf71a84b92f35410cceab5a1fbd062a5134689
2020-11-06 06:40:52 +00:00
James Mattis
ab87d08537 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
2020-11-06 06:03:37 +00:00
James Mattis
bd74d7c875 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
2020-11-06 05:47:26 +00:00
James Mattis
a5bd693f29 Merge "Adding multilayered requests to NetworkRequestInfo" am: f2c37de2ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486199

Change-Id: I57d85884e4bf6039cf645ed58e2c7b0c8fd404a2
2020-11-06 05:19:47 +00:00
James Mattis
7835f74bac 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
2020-11-05 13:55:50 -08:00
Paul Hu
5202e6b0c3 Merge "Replace Context @hide APIs" am: f021a81854 am: 8fabfb25c3 am: fe50f2ab24 am: bbc5a2473f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458063

Change-Id: I5241814fffc4ef794c07abca748d650c720576eb
2020-11-05 09:51:13 +00:00
Paul Hu
3a7da1101b Merge "Replace AppOpsManager @hide APIs" am: 12e9b2ecb5 am: 0631c7bc98 am: 35e3902531 am: c34ced274a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469126

Change-Id: I3edb79a9e05efb0c898a393a7ab98cd9d3305466
2020-11-05 09:50:51 +00:00
Paul Hu
bbc5a2473f 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
2020-11-05 09:38:40 +00:00
Paul Hu
c34ced274a 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
2020-11-05 09:38:29 +00:00
Paul Hu
fe50f2ab24 Merge "Replace Context @hide APIs" am: f021a81854 am: 8fabfb25c3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458063

Change-Id: Iea56458847be39665e7660f048eec88147be27c3
2020-11-05 09:14:59 +00:00
Paul Hu
35e3902531 Merge "Replace AppOpsManager @hide APIs" am: 12e9b2ecb5 am: 0631c7bc98
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469126

Change-Id: I9548c666d528e025b71f5d3b12b0c5ff2265eb23
2020-11-05 09:14:46 +00:00
Paul Hu
8fabfb25c3 Merge "Replace Context @hide APIs" am: f021a81854
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458063

Change-Id: I914ee12abdcba7c53fb868425592d6458a797e23
2020-11-05 08:53:01 +00:00
Paul Hu
0631c7bc98 Merge "Replace AppOpsManager @hide APIs" am: 12e9b2ecb5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469126

Change-Id: I6222db7e8f966d7df17de9c46b5e26e715ecccf2
2020-11-05 08:45:52 +00:00
Paul Hu
f021a81854 Merge "Replace Context @hide APIs" 2020-11-05 08:05:09 +00:00
Paul Hu
12e9b2ecb5 Merge "Replace AppOpsManager @hide APIs" 2020-11-05 08:03:55 +00:00
James Mattis
42b1a1b729 Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82 am: b15efe2545 am: 57675a19e0 am: 4349a76d6f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487452

Change-Id: I3f6ba3a835372b423c9edd4c9a986189b1b59039
2020-11-05 06:51:26 +00:00
Chalard Jean
26004aeff9 Merge "Move module utils to the module package." 2020-11-05 06:45:18 +00:00
James Mattis
4349a76d6f 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
2020-11-05 06:00:08 +00:00
James Mattis
57675a19e0 Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82 am: b15efe2545
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487452

Change-Id: Ic5b96ccbba713327c70a62ba584129ab20f35db6
2020-11-05 05:49:10 +00:00
James Mattis
b15efe2545 Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487452

Change-Id: I92bd7437dede4ae4a4bb27dfbf68a5ae74553811
2020-11-05 05:24:33 +00:00
James Mattis
082528f4b6 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
2020-11-04 16:52:11 -08:00