Commit Graph

591 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
d76107e54f 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
2021-05-12 14:25:23 +00:00
Remi NGUYEN VAN
b51eefe6de 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
2021-05-12 14:25:00 +00:00
Remi NGUYEN VAN
3c157047e2 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
2021-05-12 14:13:20 +00:00
Remi NGUYEN VAN
d1104c9620 Merge "Build framework-connectivity using module_current" am: eb0961067e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703085

Change-Id: I67461b530e5292f94e3e1426ff0ec93ea657cf21
2021-05-12 14:05:55 +00:00
Remi NGUYEN VAN
954385ffac Merge "Move NetworkUtils JNI out of core/jni" 2021-05-12 13:12:09 +00:00
Remi NGUYEN VAN
eb0961067e Merge "Build framework-connectivity using module_current" 2021-05-12 13:11:22 +00:00
Lorenzo Colitti
3823e673eb 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
2021-05-12 09:56:38 +00:00
Lorenzo Colitti
245e5cbe2b Merge "Rename unwanted capabilities to forbidden capabilities." am: 0d942e81c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687485

Change-Id: Iaf8da730305ed7294cc624d4d41b0a11f2872863
2021-05-12 09:15:30 +00:00
Lorenzo Colitti
0d942e81c7 Merge "Rename unwanted capabilities to forbidden capabilities." 2021-05-12 09:00:17 +00:00
David Su
32cee1bf1b 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
2021-05-11 16:48:03 +00:00
David Su
ee28d79784 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
2021-05-11 16:10:55 +00:00
David Su
cf514f511d Merge "Emphasize possibility of multiple networks with same transport" 2021-05-11 15:51:28 +00:00
Remi NGUYEN VAN
1fd558efee 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
2021-05-11 13:02:39 +00:00
Remi NGUYEN VAN
e4d51c9710 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
2021-05-11 13:00:42 +00:00
Lorenzo Colitti
395fafb54f 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
2021-05-11 17:46:13 +09:00
Junyu Lai
efca123280 Merge "Add doc to getNetworkCapabilities" am: 59d89299c9 am: 622e129d00
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690668

Change-Id: Iab7908bbeb3fd58599d7702e44450a4224a78f5b
2021-05-03 03:50:18 +00:00
Junyu Lai
622e129d00 Merge "Add doc to getNetworkCapabilities" am: 59d89299c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690668

Change-Id: I81c764ca04e3a300272ba18faa35d9fb0ecb54b1
2021-05-03 03:34:22 +00:00
Junyu Lai
59d89299c9 Merge "Add doc to getNetworkCapabilities" 2021-05-03 03:16:24 +00:00
Chalard Jean
070bdd4b77 Add doc to getNetworkCapabilities
Test: doc-only change
Fixes: 158092418
Change-Id: Ic20fb55e1bdd4e836468794d1f86d3e9d0bc5965
2021-04-30 11:24:00 +00:00
Treehugger Robot
7d4cea5005 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
2021-04-29 05:28:28 +00:00
Treehugger Robot
b481b9cef3 Merge "Rename getAllNetworkStateSnapshot which should be pluralized" am: 984e51670e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684034

Change-Id: Ie83813d57b678de4f60fe8e70aa1aa42d74a0bc8
2021-04-29 05:07:31 +00:00
Treehugger Robot
984e51670e Merge "Rename getAllNetworkStateSnapshot which should be pluralized" 2021-04-29 04:40:51 +00:00
Chiachang Wang
e05478fba9 Merge "Address API review feedback" am: 5e2a729668 am: ce433429ab
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679763

Change-Id: I39de2c7701114faa0bf699a2fdb725a57188886a
2021-04-26 01:15:12 +00:00
Chiachang Wang
ce433429ab Merge "Address API review feedback" am: 5e2a729668
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679763

Change-Id: I7a454e891edf3177bd87f041473f2749d3ee309f
2021-04-26 00:43:15 +00:00
Chiachang Wang
5e2a729668 Merge "Address API review feedback" 2021-04-26 00:22:27 +00:00
Remi NGUYEN VAN
a9078dcf2c 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
2021-04-23 06:36:06 +00:00
Remi NGUYEN VAN
343e810f30 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
2021-04-23 06:35:34 +00:00
Remi NGUYEN VAN
5bbad161b4 Merge "Use connectivity resources in service-connectivity" am: 03e53854e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646967

Change-Id: I2169a7c0c8b5eb1073789ffc115cdec73fbe3ab8
2021-04-23 06:10:14 +00:00
Remi NGUYEN VAN
f6de130389 Merge "Add AOSP certificates for connectivity resources" am: bef754dcd5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684645

Change-Id: Ia8e130fe84aecefb29ee8eded1fa480517ac4ebf
2021-04-23 06:05:36 +00:00
Remi NGUYEN VAN
03e53854e5 Merge "Use connectivity resources in service-connectivity" 2021-04-23 05:42:13 +00:00
Remi NGUYEN VAN
bef754dcd5 Merge "Add AOSP certificates for connectivity resources" 2021-04-23 05:40:58 +00:00
Chiachang Wang
9075ae36be 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
2021-04-23 02:46:05 +00:00
Remi NGUYEN VAN
962d13bd3e 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
2021-04-23 10:36:15 +09:00
Aaron Huang
da103b3365 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
2021-04-22 17:45:22 +08:00
Remi NGUYEN VAN
51b8cb4889 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
2021-04-22 16:52:19 +09:00
Treehugger Robot
f62a74d65d 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
2021-04-22 05:22:10 +00:00
Treehugger Robot
eb452d7330 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
2021-04-22 05:03:42 +00:00
Treehugger Robot
19a855be79 Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" 2021-04-22 04:43:26 +00:00
Treehugger Robot
662285d428 Merge "Do not deduce VCN capability if Builder is derived from request" am: ed05115dca am: b91719b526
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683015

Change-Id: Ib6a1b690c32b25aa86d8d432ac3f3a9eb1803efa
2021-04-21 14:57:42 +00:00
Treehugger Robot
b91719b526 Merge "Do not deduce VCN capability if Builder is derived from request" am: ed05115dca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683015

Change-Id: I19da4ae952b5d412b429aa291868e8e7980ad5fd
2021-04-21 14:29:33 +00:00
Treehugger Robot
ed05115dca Merge "Do not deduce VCN capability if Builder is derived from request" 2021-04-21 14:06:14 +00:00
junyulai
aab5a92321 Do not deduce VCN capability if Builder is derived from request
If the caller constructed the builder from a request, it means
the user might explicitly want the capabilities from the request.
Thus, the NOT_VCN_MANAGED capabilities should not be touched
later.

Test: TH
Fix: 185876442
Change-Id: I92037cc8547fb72de12d6b6402f060f6c98e1853
2021-04-21 19:10:28 +08:00
Treehugger Robot
7663d1760d Merge "Add the related extra information in the javadoc" am: f78aabbf82 am: db0c8c32b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681465

Change-Id: Ia2c8d547ec240b828925a98bf2e43291ababebca
2021-04-21 08:53:50 +00:00
Treehugger Robot
05197722a3 Merge "Change Connectivity resources SDK version to 30" am: b15df2fce6 am: 9c4a07f441
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679749

Change-Id: I603b13d9a9db97d83591ef8e41fe68c02cb3e96a
2021-04-21 08:53:27 +00:00
Treehugger Robot
db0c8c32b1 Merge "Add the related extra information in the javadoc" am: f78aabbf82
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681465

Change-Id: I6ea797209d4d4118ffd28acba4dd419f56d90536
2021-04-21 08:28:23 +00:00
Treehugger Robot
9c4a07f441 Merge "Change Connectivity resources SDK version to 30" am: b15df2fce6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679749

Change-Id: I0ef9286794a6013b50fb1dfd0b59d35a5ae55c20
2021-04-21 08:25:39 +00:00
Treehugger Robot
f78aabbf82 Merge "Add the related extra information in the javadoc" 2021-04-21 08:22:43 +00:00
Treehugger Robot
b15df2fce6 Merge "Change Connectivity resources SDK version to 30" 2021-04-21 08:00:41 +00:00
lucaslin
8bee2fd622 Add the related extra information in the javadoc
Bug: 185876442
Test: make docs
Change-Id: Ib0abc43e2009dbf5ee7b6c2a076424834d3d53f2
2021-04-21 10:43:15 +08:00
markchien
27bfb8d418 Change Connectivity resources SDK version to 30
S tethering module fail to sideload in R platform because package
manager fail to parse S version sdk in R platform.

Bug: 182409819
Test: m
Change-Id: I35c63e4bfe7657afe1e7364926ab139b042b403e
Merged-In: I35c63e4bfe7657afe1e7364926ab139b042b403e
2021-04-20 06:21:04 +00:00