Commit Graph

921 Commits

Author SHA1 Message Date
Lorenzo Colitti
9c0095c9e7 Remove EXTRA_PROXY_INFO.
This has been deprecated since M because it very error-prone, and
there are documented replacements.

Test: m
Bug: 171872228
Change-Id: Ide9846a26fc440b3ec5b4e4b444a046e738de3d6
2021-04-27 20:01:22 +09:00
Lucas Lin
8ce758768f Merge "Update PrivateDnsMode from StringDef to IntDef" into sc-dev 2021-04-27 06:03:14 +00:00
Chiachang Wang
5f7a8a763d [automerger skipped] Merge "Address API review feedback" am: 5e2a729668 am: ce433429ab am: e05478fba9 -s ours
am skip reason: skip tag Change-Id I5e8c4bed8bda40d507afa894c359b5e24ee5d868 with SHA-1 c7d203dfcb is already in history

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

Change-Id: I859b0bd64ce3c38693e19209783bcdf91a562ef2
2021-04-26 01:34:33 +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
lucaslin
57ee606244 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
2021-04-23 21:03:39 +08:00
Remi NGUYEN VAN
456add99dd [automerger skipped] Merge "Use connectivity resources in service-connectivity" am: 03e53854e5 am: 5bbad161b4 am: a9078dcf2c -s ours
am skip reason: skip tag Change-Id I778d94a5aac0c4e20e78b1ba3a002495c17a38a0 with SHA-1 9f4fad49a5 is already in history

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

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

Change-Id: Ia7809d391c86f2a9aa5ce43a5d3f4c145bf12e2c
2021-04-23 06:56:38 +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
Chiachang Wang
6f7ac6860e Merge "Address API review feedback" into sc-dev 2021-04-23 00:30:51 +00: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
8ba68598ec [automerger skipped] Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" am: 19a855be79 am: eb452d7330 am: f62a74d65d -s ours
am skip reason: skip tag Change-Id I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7 with SHA-1 9605391498 is already in history

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

Change-Id: I9be0b8d219ff67948ed19a45d60381ba69c963df
2021-04-22 05:47:34 +00: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
7d6e4fb193 Merge "Do not deduce VCN capability if Builder is derived from request" am: ed05115dca am: b91719b526 am: 662285d428
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683015

Change-Id: I6ecdb60e530807c8a93f2709784cf1b5814a2178
2021-04-21 15:21:59 +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
9eea7b3d09 Merge "Add the related extra information in the javadoc" am: f78aabbf82 am: db0c8c32b1 am: 7663d1760d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681465

Change-Id: I9eb3c2543787a91f211be5eb7b92b66fe696489f
2021-04-21 09:19:13 +00:00
Treehugger Robot
03c5476aec [automerger skipped] Merge "Change Connectivity resources SDK version to 30" am: b15df2fce6 am: 9c4a07f441 am: 05197722a3 -s ours
am skip reason: skip tag Change-Id I35c63e4bfe7657afe1e7364926ab139b042b403e with SHA-1 02bc5e3eef is already in history

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

Change-Id: I09477ef4873bab9cb8b319a341502fc7f8fbec0f
2021-04-21 09:18:56 +00: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
Chiachang Wang
c7d203dfcb 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
Test: atest FrameworksMockingServicesTests
Change-Id: I5e8c4bed8bda40d507afa894c359b5e24ee5d868
2021-04-20 09:30:59 +00: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
markchien
02bc5e3eef 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
2021-04-20 14:19:01 +08:00
Aaron Huang
7f852c082d Merge "Rename getAllNetworkStateSnapshot which should be pluralized" into sc-dev 2021-04-19 16:42:58 +00:00
junyulai
651928c310 [VCN19] Rename get/setSubIds to get/setSubscriptionIds
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215036
Merged-In: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7
Change-Id: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7
  (cherry-picked from ag/14198665)
2021-04-19 17:41:01 +08:00
Aaron Huang
ab615e5c03 Rename getAllNetworkStateSnapshot which should be pluralized
Address API review feedback, ConnectivityManager#getAllNetworkStateSnapshot
should be pluralized so rename the method to getAllNetworkStateSnapshots

Bug: 183972554
Test: make, FrameworksNetTests
      FrameworksServicesTests
Change-Id: Ic18d17d05984fa2466c962c7843c0ef7183ce77c
2021-04-17 14:08:49 +08:00
Junyu Lai
2d712228b6 [automerger skipped] Merge "[VCN20] Change requestBackgroundNetwork argument order" am: c8499660b2 am: 6c8ddf0c54 am: e03baea556 -s ours
am skip reason: skip tag Change-Id Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb with SHA-1 ca657cbca4 is already in history

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

Change-Id: Icd3d0fe11a9de3c98d55fb91e935dc537a28af48
2021-04-16 17:16:07 +00:00
Junyu Lai
e03baea556 Merge "[VCN20] Change requestBackgroundNetwork argument order" am: c8499660b2 am: 6c8ddf0c54
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675630

Change-Id: I2b4369cb4127f130076ced52ba020db99f617cd7
2021-04-16 16:52:07 +00:00
Junyu Lai
6c8ddf0c54 Merge "[VCN20] Change requestBackgroundNetwork argument order" am: c8499660b2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675630

Change-Id: I73df5528088176070af6e54e01358b1edec27b50
2021-04-16 16:25:55 +00:00
Junyu Lai
c8499660b2 Merge "[VCN20] Change requestBackgroundNetwork argument order" 2021-04-16 16:04:31 +00:00
Junyu Lai
05614b419a Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" into sc-dev 2021-04-16 15:59:16 +00:00
Lorenzo Colitti
5caa63278d Merge "Don't expose raw IBinder APIs." am: 6f68764bf2 am: c0c07c1b57 am: 15f9321d90
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676436

Change-Id: Ic45558c739cfb065e5c9d6fb5ebf485ceb9a630f
2021-04-16 08:48:41 +00:00
Lorenzo Colitti
15f9321d90 Merge "Don't expose raw IBinder APIs." am: 6f68764bf2 am: c0c07c1b57
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676436

Change-Id: I42ef2c83eefc6dc4967e71be82f48cca38d74f43
2021-04-16 08:13:03 +00:00