Merge "Update PrivateDnsMode from StringDef to IntDef" am: a23e55da49 am: da89f66c81
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675562
Change-Id: I0b2ad20c59397395175b82688cfe657af43a1b19
Lucas Lin
authored and
Automerger Merge Worker
commited 2021-05-12 17:59:57 +00:00
bd90eed310
Merge "Update PrivateDnsMode from StringDef to IntDef" am: a23e55da49
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675562
Change-Id: I391d8dd2615f090d3112af69248aea70e334f62f
Lucas Lin
authored and
Automerger Merge Worker
commited 2021-05-12 17:23:45 +00:00
da89f66c81
Merge "Update PrivateDnsMode from StringDef to IntDef"
Lucas Lin
authored and
Gerrit Code Review
commited 2021-05-12 17:09:50 +00:00
a23e55da49
Merge "Allow any transport with TEST if the network is restricted" am: 6e80f1c182 am: 5fdbf4d6de
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702489
Change-Id: I8b42aa698f279774b8d5781811dc848c7d7ff713
Chalard Jean
authored and
Automerger Merge Worker
commited 2021-05-12 14:33:13 +00:00
a6b91aafee
Merge "Allow any transport with TEST if the network is restricted" am: 6e80f1c182
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702489
Change-Id: Ic688c9d328242962c57631632b33236a69852ed6
Chalard Jean
authored and
Automerger Merge Worker
commited 2021-05-12 14:29:56 +00:00
5fdbf4d6de
Merge "Use jniThrowErrnoException from JNIHelp" am: 25a08f056f am: e92d0602f1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703087
Change-Id: I52864a1dff894d827e97332ce9ddd506ae297270
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-05-12 14:25:42 +00:00
b86c71b25a
Merge "Move NetworkUtils JNI out of core/jni" am: 954385ffac am: 3c157047e2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703086
Change-Id: Icc10740c6f18755a86d4f3cc9fb59bcb6a933910
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-05-12 14:25:23 +00:00
d76107e54f
Merge "Build framework-connectivity using module_current" am: eb0961067e am: d1104c9620
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703085
Change-Id: I47046e76bab062d0f887f2f965c054054acba0c5
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-05-12 14:25:00 +00:00
b51eefe6de
Merge "Use jniThrowErrnoException from JNIHelp" am: 25a08f056f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703087
Change-Id: I6a1d75a1792883a7dc96c1beb108e83653c668a0
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-05-12 14:17:28 +00:00
e92d0602f1
Merge "Move NetworkUtils JNI out of core/jni" am: 954385ffac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703086
Change-Id: Icd812cda9e75015093080126bd20210034af5839
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-05-12 14:13:20 +00:00
3c157047e2
Merge "Build framework-connectivity using module_current" am: eb0961067e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703085
Change-Id: I67461b530e5292f94e3e1426ff0ec93ea657cf21
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-05-12 14:05:55 +00:00
d1104c9620
Merge "Allow any transport with TEST if the network is restricted"
Chalard Jean
authored and
Gerrit Code Review
commited 2021-05-12 13:57:31 +00:00
6e80f1c182
Merge "Use jniThrowErrnoException from JNIHelp"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2021-05-12 13:12:32 +00:00
25a08f056f
Merge "Move NetworkUtils JNI out of core/jni"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2021-05-12 13:12:09 +00:00
954385ffac
Merge "Build framework-connectivity using module_current"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2021-05-12 13:11:22 +00:00
eb0961067e
Merge "Rename unwanted capabilities to forbidden capabilities." am: 0d942e81c7 am: 245e5cbe2b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687485
Change-Id: I9b8a61b4c4a0059af294c2575e5339e7e3b9f3ed
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-05-12 09:56:38 +00:00
3823e673eb
Merge "Rename unwanted capabilities to forbidden capabilities." am: 0d942e81c7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687485
Change-Id: Iaf8da730305ed7294cc624d4d41b0a11f2872863
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-05-12 09:15:30 +00:00
245e5cbe2b
Merge "Rename unwanted capabilities to forbidden capabilities."
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2021-05-12 09:00:17 +00:00
0d942e81c7
Merge "Emphasize possibility of multiple networks with same transport" am: cf514f511d am: ee28d79784
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620459
Change-Id: If641ab6d8ab300048c5666eea399e3ab8404d826
David Su
authored and
Automerger Merge Worker
commited 2021-05-11 16:48:03 +00:00
32cee1bf1b
Merge "Emphasize possibility of multiple networks with same transport" am: cf514f511d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620459
Change-Id: I5ce97c2040817b68c6b70640db22d5d04bb304f3
David Su
authored and
Automerger Merge Worker
commited 2021-05-11 16:10:55 +00:00
ee28d79784
Merge "Emphasize possibility of multiple networks with same transport"
David Su
authored and
Gerrit Code Review
commited 2021-05-11 15:51:28 +00:00
cf514f511d
Use jniThrowErrnoException from JNIHelp
...
Use the jniThrowErrnoException that is available in JNIHelp, instead of
reimplementing in NetworkUtils.
Bug: 179229316
Test: device boots and has connectivity
Merged-In: I257a9d55ce1f5a7c588e209b4a89d3e7a3e09994
Change-Id: I257a9d55ce1f5a7c588e209b4a89d3e7a3e09994
Remi NGUYEN VAN
commited 2021-05-11 14:18:27 +00:00
62c5136e00
Move NetworkUtils JNI out of core/jni
...
Keep the utilities included via a library, but move them out of
core/jni, and prepare a library to package them together with
framework-connectivity.
Also remove unnecessary dependencies in framework-connectivity.
Bug: 171540887
Test: device boots and has connectivity
Merged-In: I0b55dfe92f3cb6e848d79ac7953756f39aaa2597
Change-Id: I0b55dfe92f3cb6e848d79ac7953756f39aaa2597
Remi NGUYEN VAN
commited 2021-05-11 13:02:39 +00:00
1fd558efee
Build framework-connectivity using module_current
...
framework-connectivity needs to build only against stable APIs.
Bug: 171540887
Test: m framework-connectivity.impl
Merged-In: I2d51d37d067bf6fe86e4dedf05855a2dd67ed57c
Change-Id: I2d51d37d067bf6fe86e4dedf05855a2dd67ed57c
Remi NGUYEN VAN
commited 2021-05-11 13:00:42 +00:00
e4d51c9710
Rename unwanted capabilities to forbidden capabilities.
...
Addresses API council feedback.
Bug: 184890428
Test: atest FrameworksNetTests CtsNetTestCases
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest on R device
Change-Id: Id7c68fbf56ee08fcad8e8e3aacf037fa1885936b
Lorenzo Colitti
commited 2021-05-11 17:46:13 +09:00
395fafb54f
Allow any transport with TEST if the network is restricted
...
This will allow CTS to add the WIFI transport and others,
letting them test a number of essential features of the
ranking algorithm.
It's relatively safe because restricted networks can never
become the default, and NOT_RESTRICTED is a default
capability so very few apps would be affected by the shell
creating such a network.
Bug: 184037351
Test: NetworkScoreTest (which is under review)
Change-Id: I21055dc613fead6130adc2122f2cdd0af9b49adf
Chalard Jean
commited 2021-05-11 15:42:10 +09:00
778c86525b
Update PrivateDnsMode from StringDef to IntDef
...
Update PrivateDnsMode from StringDef to IntDef because IntDef is
the normal way of representing multiple choices in public API.
Also update other related files.
Bug: 185311744
Test: 1. make update-api
2. atest FrameworksNetTests CtsNetTestCases CtsNetTestCasesLatestSdk
3. atest FrameworksServicesTests:DevicePolicyManagerTest
Change-Id: I23e7ec140066979726d769cabc5f7057bb2167e6
Merged-In: I23e7ec140066979726d769cabc5f7057bb2167e6
(Cherry-picked from ag/14227609)
lucaslin
authored and
Lucas Lin
commited 2021-05-05 03:19:51 +00:00
57f9ba8b40
Merge "Add doc to getNetworkCapabilities" am: 59d89299c9 am: 622e129d00
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690668
Change-Id: Iab7908bbeb3fd58599d7702e44450a4224a78f5b
Junyu Lai
authored and
Automerger Merge Worker
commited 2021-05-03 03:50:18 +00:00
efca123280
Merge "Add doc to getNetworkCapabilities" am: 59d89299c9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690668
Change-Id: I81c764ca04e3a300272ba18faa35d9fb0ecb54b1
Junyu Lai
authored and
Automerger Merge Worker
commited 2021-05-03 03:34:22 +00:00
622e129d00
Merge "Add doc to getNetworkCapabilities"
Junyu Lai
authored and
Gerrit Code Review
commited 2021-05-03 03:16:24 +00:00
59d89299c9
Add doc to getNetworkCapabilities
...
Test: doc-only change
Fixes: 158092418
Change-Id: Ic20fb55e1bdd4e836468794d1f86d3e9d0bc5965
Chalard Jean
commited 2021-04-30 11:24:00 +00:00
070bdd4b77
Merge "Rename getAllNetworkStateSnapshot which should be pluralized" am: 984e51670e am: b481b9cef3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684034
Change-Id: I0fa34d7cddaede25898d262196804bdd327caf8e
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-04-29 05:28:28 +00:00
7d4cea5005
Merge "Rename getAllNetworkStateSnapshot which should be pluralized" am: 984e51670e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684034
Change-Id: Ie83813d57b678de4f60fe8e70aa1aa42d74a0bc8
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-04-29 05:07:31 +00:00
b481b9cef3
Merge "Rename getAllNetworkStateSnapshot which should be pluralized"
Treehugger Robot
authored and
Gerrit Code Review
commited 2021-04-29 04:40:51 +00:00
984e51670e
Merge "Address API review feedback" am: 5e2a729668 am: ce433429ab
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679763
Change-Id: I39de2c7701114faa0bf699a2fdb725a57188886a
Chiachang Wang
authored and
Automerger Merge Worker
commited 2021-04-26 01:15:12 +00:00
e05478fba9
Merge "Address API review feedback" am: 5e2a729668
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679763
Change-Id: I7a454e891edf3177bd87f041473f2749d3ee309f
Chiachang Wang
authored and
Automerger Merge Worker
commited 2021-04-26 00:43:15 +00:00
ce433429ab
Merge "Address API review feedback"
Chiachang Wang
authored and
Gerrit Code Review
commited 2021-04-26 00:22:27 +00:00
5e2a729668
Merge "Use connectivity resources in service-connectivity" am: 03e53854e5 am: 5bbad161b4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646967
Change-Id: I919b54b5527fbe3f9609c6ae70a31a651e4fda90
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-04-23 06:36:06 +00:00
a9078dcf2c
Merge "Add AOSP certificates for connectivity resources" am: bef754dcd5 am: f6de130389
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684645
Change-Id: Ifa29b6c542a1b229d5fe32cf81c5189541af3f28
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-04-23 06:35:34 +00:00
343e810f30
Merge "Use connectivity resources in service-connectivity" am: 03e53854e5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646967
Change-Id: I2169a7c0c8b5eb1073789ffc115cdec73fbe3ab8
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-04-23 06:10:14 +00:00
5bbad161b4
Merge "Add AOSP certificates for connectivity resources" am: bef754dcd5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684645
Change-Id: Ia8e130fe84aecefb29ee8eded1fa480517ac4ebf
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-04-23 06:05:36 +00:00
f6de130389
Merge "Use connectivity resources in service-connectivity"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2021-04-23 05:42:13 +00:00
03e53854e5
Merge "Add AOSP certificates for connectivity resources"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2021-04-23 05:40:58 +00:00
bef754dcd5
Address API review feedback
...
Address API review feedback to:
- Rename NetworkAgent#setTeardownDelayMs to
NetworkAgent#setTeardownDelayMillis
- Use getters instead of fields in VpnTransportInfo
- Rename registerDefaultNetworkCallbackAsUid to
registerDefaultNetworkCallbackForUid in ConnectiivityManager
Bug: 183972850
Bug: 185246410
Fix: 184735863
Test: make update-api
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk
Change-Id: I5e8c4bed8bda40d507afa894c359b5e24ee5d868
Merged-In: I5e8c4bed8bda40d507afa894c359b5e24ee5d868
Chiachang Wang
commited 2021-04-23 02:46:05 +00:00
9075ae36be
Use connectivity resources in service-connectivity
...
Migrate resource usage to the connectivity resource package.
For framework resources that have known overlays, keep a fallback until
the overlays can be migrated.
Bug: 182125649
Test: atest FrameworksNetTests
Merged-In: I778d94a5aac0c4e20e78b1ba3a002495c17a38a0
(clean cherry-pick)
Change-Id: I778d94a5aac0c4e20e78b1ba3a002495c17a38a0
Remi NGUYEN VAN
commited 2021-04-23 10:36:15 +09:00
962d13bd3e
Rename getAllNetworkStateSnapshot which should be pluralized
...
Address API review feedback, ConnectivityManager#getAllNetworkStateSnapshot
should be pluralized so rename the method to getAllNetworkStateSnapshots
(cherry picked from ag/14221105)
Bug: 183972554
Test: make, FrameworksNetTests
FrameworksServicesTests
Merged-In: Ic18d17d05984fa2466c962c7843c0ef7183ce77c
Change-Id: Ic18d17d05984fa2466c962c7843c0ef7183ce77c
Aaron Huang
commited 2021-04-22 17:45:22 +08:00
da103b3365
Add AOSP certificates for connectivity resources
...
Instead of the platform certificate, use a dedicated certificate.
The AOSP certificates are only used for testing as they have known keys,
and are replaced when resigning production images.
Key generated with:
openssl req -x509 -newkey rsa:4096 -nodes -days 999999 -keyout key.pem \
-out com.android.connectivity.resources.x509.pem
openssl pkcs8 -topk8 -inform PEM -outform DER -in key.pem -out \
com.android.connectivity.resources.pk8 -nocrypt
Fixes: 184808224
Fixes: 185462051
Test: m
Change-Id: I25cddc8d5ab948da9d3a2dbcd202ece1f61dd5a2
Remi NGUYEN VAN
commited 2021-04-22 16:52:19 +09:00
51b8cb4889
Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" am: 19a855be79 am: eb452d7330
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675629
Change-Id: I0292c32f0c0140213aa12309032421a18105bf02
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-04-22 05:22:10 +00:00
f62a74d65d
Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" am: 19a855be79
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675629
Change-Id: Iccc7fe3e625083ee60a54d0e3719d1c8b2458a72
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-04-22 05:03:42 +00:00
eb452d7330
Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds"
Treehugger Robot
authored and
Gerrit Code Review
commited 2021-04-22 04:43:26 +00:00
19a855be79