Commit Graph

12925 Commits

Author SHA1 Message Date
Treehugger Robot
18e5c6bd73 Merge "Add getters to NetworkStateSnapshot" am: 1c9a1c1353
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684649

Change-Id: I3263514a5d75141c81e5f9d7389603ed369e95df
2021-04-29 09:39:19 +00:00
Treehugger Robot
1c9a1c1353 Merge "Add getters to NetworkStateSnapshot" 2021-04-29 09:20:34 +00:00
Treehugger Robot
6748a5655a Merge "Add getters to UnderlyingNetworkInfo" am: 3cf9eef4cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684651

Change-Id: I97222bb04bdea78178741245016658cad7f082dc
2021-04-29 08:16:36 +00:00
Treehugger Robot
3cf9eef4cc Merge "Add getters to UnderlyingNetworkInfo" 2021-04-29 07:29:08 +00:00
Treehugger Robot
1ce31a69c0 Merge "Rename getAllNetworkStateSnapshot which should be pluralized" am: 416a37f7f8
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
416a37f7f8 Merge "Rename getAllNetworkStateSnapshot which should be pluralized" 2021-04-29 04:40:51 +00:00
Les Lee
1b73eabbce Merge "wifi data usage: support to get carrier merged wifi network." am: 8eb01a8a7e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538743

Change-Id: I01b6790de48a514256f51ebb85226e56c6e2f59b
2021-04-27 03:26:31 +00:00
Les Lee
8eb01a8a7e Merge "wifi data usage: support to get carrier merged wifi network." 2021-04-27 02:13:32 +00:00
James Mattis
9aba2cb910 Merge "Changing per-app default request to TRACK_DEFAULT" am: 4a57fe5c2b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682063

Change-Id: I9632d12c85cc7d0c7d3c80333fdfba7ff024bff2
2021-04-26 15:07:48 +00:00
James Mattis
4a57fe5c2b Merge "Changing per-app default request to TRACK_DEFAULT" 2021-04-26 14:39:44 +00:00
Chiachang Wang
e9bee72082 Merge "Address API review feedback" am: 14a74d0c62
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
14a74d0c62 Merge "Address API review feedback" 2021-04-26 00:22:27 +00:00
James Mattis
0abefa739d Changing per-app default request to TRACK_DEFAULT
Changing the per-app default request flows to fallback to a request of
type TRACK_DEFAULT as opposed to type REQUEST. The main benefit of this
change is that these requests will no longer be sent to the factories
which is desired.

Bug: 180452284
Bug: 176494815
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I312e55a54f70aa82953a32ab9369d5afc02b75e5
Merged-In: I312e55a54f70aa82953a32ab9369d5afc02b75e5
2021-04-23 07:47:11 -07:00
Remi NGUYEN VAN
f8bb8efa5c Merge "Use connectivity resources in service-connectivity" am: 41869c65a9
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
582734224c Merge "Add AOSP certificates for connectivity resources" am: 2b41bf80ee
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
41869c65a9 Merge "Use connectivity resources in service-connectivity" 2021-04-23 05:42:13 +00:00
Remi NGUYEN VAN
2b41bf80ee Merge "Add AOSP certificates for connectivity resources" 2021-04-23 05:40:58 +00:00
Chiachang Wang
2cd79f28d8 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
a4bef5d40b 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
Remi NGUYEN VAN
d291190b8c Merge "Add QUERY_ALL_PACKAGES to net integration tests" am: 8acce32060
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684407

Change-Id: I4a83c0718b766404bb23cb8dcf5f6b767a9dca8f
2021-04-22 15:04:20 +00:00
Remi NGUYEN VAN
8acce32060 Merge "Add QUERY_ALL_PACKAGES to net integration tests" 2021-04-22 14:38:40 +00:00
Aaron Huang
e1c4b4fcb7 Add getters to UnderlyingNetworkInfo
Address API review feedback, add getters to UnderlyingNetworkInfo
instead of exposing fields.

Instead of wasting memory by converting this into an array, have
migrateTun take a List<String>. In turn, tunAdjustmentInit should
also take a List<String>.

(cherry picked from ag/14211075)
Bug: 183972554
Test: atest android.net.UnderlyingNetworkInfoTest
Merged-In: Id59744097208d91298a25ef110ade91a9cf291a1
Change-Id: Id59744097208d91298a25ef110ade91a9cf291a1
2021-04-22 22:30:42 +08:00
Remi NGUYEN VAN
924c94e7cd Add QUERY_ALL_PACKAGES to net integration tests
The permission is necessary for ConnectivityService to obtain its
resource package. As the integration tests run ConnectivityService
in-process, they need the permission.

Bug: 186091860
Test: atest FrameworksNetIntegrationTests
Change-Id: I60cf9b54faddf0ea4cb02146c83c9bba58370749
2021-04-22 22:02:01 +09:00
Aaron Huang
b18cb78d6a Add getters to NetworkStateSnapshot
Address API council feedback, add getters to NetworkStateSnapshot
instead of exposing the bare fields directly.

(cherry picked from ag/14233655)
Bug: 183972826
Test: FrameworksNetTests
Merged-In: Id1707753b42ae88d2b95e4bd00a792609434e4f5
Change-Id: Id1707753b42ae88d2b95e4bd00a792609434e4f5
2021-04-22 18:21:00 +08:00
Aaron Huang
3227bfb2dc 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
821108b3e2 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
8200dbed1d Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" am: 4995a0bbaa
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
4995a0bbaa Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" 2021-04-22 04:43:26 +00:00
Lorenzo Colitti
d782bc08d0 Merge "Hide NetworkPolicyManager.blockedReasonsToString API." am: 82efa81cd7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682220

Change-Id: Ic098dc012380be363d7acb088dab34343dd250e0
2021-04-22 03:01:56 +00:00
Lorenzo Colitti
82efa81cd7 Merge "Hide NetworkPolicyManager.blockedReasonsToString API." 2021-04-22 02:36:11 +00:00
Treehugger Robot
d6d2cfa107 Merge "Do not deduce VCN capability if Builder is derived from request" am: b808656439
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
b808656439 Merge "Do not deduce VCN capability if Builder is derived from request" 2021-04-21 14:06:14 +00:00
junyulai
be1c5ddd2f 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
e38830b5a1 Merge "Add the related extra information in the javadoc" am: fccaf80eba
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
610cb04212 Merge "Change Connectivity resources SDK version to 30" am: 742164747b
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
fccaf80eba Merge "Add the related extra information in the javadoc" 2021-04-21 08:22:43 +00:00
Treehugger Robot
742164747b Merge "Change Connectivity resources SDK version to 30" 2021-04-21 08:00:41 +00:00
Sudheer Shanka
b9c396eef9 Hide NetworkPolicyManager.blockedReasonsToString API.
BLOCKED_REASON_* constants have been moved to ConnectivityManager
and blockedReasonsToString() util method doesn't belong in
NetworkPolicyManager as an API. So, just removing it for now.

Bug: 185967486
Test: treehugger
Change-Id: Ie04044980fdfc7ec772444be13fc659880953bd1
2021-04-21 07:23:54 +00:00
lucaslin
8a8cb5d4ab Add the related extra information in the javadoc
Bug: 185876442
Test: make docs
Change-Id: Ib0abc43e2009dbf5ee7b6c2a076424834d3d53f2
2021-04-21 10:43:15 +08:00
James Mattis
b039be7617 Merge "Correctly count nri uid request counts" am: 5ab962df61
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655051

Change-Id: I5ab86516030c8758b77c7335da68fd4f01b34a60
2021-04-21 02:23:29 +00:00
James Mattis
5ab962df61 Merge "Correctly count nri uid request counts" 2021-04-21 02:06:33 +00:00
Nazanin Bakhshi
3779168261 Merge "Refactoring and mocking to make sure unit test doesn't call the real service" am: 348f5cb01e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1668228

Change-Id: Iaaa8635c0c1031f6b7e896c879de9744a1215f54
2021-04-20 16:27:56 +00:00
Nazanin Bakhshi
348f5cb01e Merge "Refactoring and mocking to make sure unit test doesn't call the real service" 2021-04-20 15:44:00 +00:00
Treehugger Robot
90d389d11f Merge "Roll forward: add a test for ParseException" am: 55b86dd028
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679759

Change-Id: I17938abef561d95347869084114ee08f90d81db5
2021-04-20 10:13:47 +00:00
Treehugger Robot
55b86dd028 Merge "Roll forward: add a test for ParseException" 2021-04-20 10:03:56 +00:00
Remi NGUYEN VAN
2d467a1678 Merge "Revert "Add a test for ParseException"" am: 060026feca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679758

Change-Id: Ifb852d9264a6e1fc5ce82a5eb35d66459a021599
2021-04-20 09:52:35 +00:00
Remi NGUYEN VAN
060026feca Merge "Revert "Add a test for ParseException"" 2021-04-20 09:25:07 +00:00
Treehugger Robot
da2dfee6d5 Merge "Update TEST_MAPPING imports for connectivity" am: e063867f7b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680905

Change-Id: I100470cc936fca8dba86a1ad083d4d67139b6aea
2021-04-20 09:06:31 +00:00
Remi NGUYEN VAN
8cb7d32b1a Update TEST_MAPPING imports for connectivity
Connectivity CTS tests were moved from cts/tests/net to
packages/modules/Connectivity.

Bug: 185751610
Change-Id: Id4efd99c419706a52ad5d708888097bd6312d4e6
Test: treehugger is needed to test
2021-04-20 07:10:41 +00:00
Remi NGUYEN VAN
96dc675760 Roll forward: add a test for ParseException
The test simply creates an exception and verifies that it has the
required fields.

The constructor tests are only run on S+ as they are not part of the
API before that.

Change-Id: Ic30a34d3203c1b40923ba783a34f0cfed53a07ae
Test: atest FrameworksNetTests
2021-04-20 16:04:33 +09:00