Remi NGUYEN VAN
0ad85e3e5e
[automerger skipped] Merge "Use jniThrowErrnoException from JNIHelp" am: 25a08f056f am: e92d0602f1 am: b86c71b25a -s ours
...
am skip reason: Merged-In I257a9d55ce1f5a7c588e209b4a89d3e7a3e09994 with SHA-1 c1f2d31b39 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703087
Change-Id: Ib3373d0634ceca77672cace31349edb4594fc46e
2021-05-12 14:43:22 +00:00
Remi NGUYEN VAN
7c690119f4
[automerger skipped] Merge "Move NetworkUtils JNI out of core/jni" am: 954385ffac am: 3c157047e2 am: d76107e54f -s ours
...
am skip reason: Merged-In I0b55dfe92f3cb6e848d79ac7953756f39aaa2597 with SHA-1 c58c993dda is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703086
Change-Id: I3724d722bc66d3c54fe1c8cebacc65c3c097e5f8
2021-05-12 14:42:55 +00:00
Remi NGUYEN VAN
85b7ed0848
[automerger skipped] Merge "Build framework-connectivity using module_current" am: eb0961067e am: d1104c9620 am: b51eefe6de -s ours
...
am skip reason: Merged-In I2d51d37d067bf6fe86e4dedf05855a2dd67ed57c with SHA-1 3b52af9c6e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703085
Change-Id: I4cf3780210515b5849832055c88dd189d7d61177
2021-05-12 14:42:03 +00:00
Remi NGUYEN VAN
b86c71b25a
Merge "Use jniThrowErrnoException from JNIHelp" am: 25a08f056f am: e92d0602f1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703087
Change-Id: I52864a1dff894d827e97332ce9ddd506ae297270
2021-05-12 14:25:42 +00:00
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
e92d0602f1
Merge "Use jniThrowErrnoException from JNIHelp" am: 25a08f056f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703087
Change-Id: I6a1d75a1792883a7dc96c1beb108e83653c668a0
2021-05-12 14:17:28 +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
25a08f056f
Merge "Use jniThrowErrnoException from JNIHelp"
2021-05-12 13:12:32 +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
f3f275419d
Merge "Rename unwanted capabilities to forbidden capabilities." am: 0d942e81c7 am: 245e5cbe2b am: 3823e673eb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687485
Change-Id: I9fcfd474b0cebdbadaad9466f5fb15b0069b55e6
2021-05-12 10:20: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
b8e4a7b1e7
Merge "Emphasize possibility of multiple networks with same transport" am: cf514f511d am: ee28d79784 am: 32cee1bf1b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620459
Change-Id: I8417a8af1202c01803c61ff54363b45960af6965
2021-05-11 17:04:48 +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
Orion Hodson
276e973b32
Merge "Move to renamed NDK symbol AFileDescriptor_getFd" into sc-dev
2021-05-11 14:31:42 +00:00
Remi NGUYEN VAN
62c5136e00
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
2021-05-11 14:18:27 +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
Lorenzo Colitti
1df16c6f8f
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-08 01:48:01 +09:00
Junyu Lai
2e3d79675b
Merge "Add doc to getNetworkCapabilities" am: 59d89299c9 am: 622e129d00 am: efca123280
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690668
Change-Id: I0c41878350ffe4015fe9e6034651f50366503dfe
2021-05-03 04:06:34 +00: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
Orion Hodson
a1a2ccb8d7
Move to renamed NDK symbol AFileDescriptor_getFd
...
Bug: 185256332
Test: TH
Change-Id: Ic13f1d9832d5ae5b6ae4b96323025d9b695fdaf9
2021-04-30 17:48:03 +01: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
Bill Yi
fb03ac13e0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7f1f328ec7a68bc9219f11fffc32b650de1a3bf3
2021-04-29 13:56:51 +00:00
Treehugger Robot
07ac16932e
[automerger skipped] Merge "Rename getAllNetworkStateSnapshot which should be pluralized" am: 984e51670e am: b481b9cef3 am: 7d4cea5005 -s ours
...
am skip reason: Merged-In Ic18d17d05984fa2466c962c7843c0ef7183ce77c with SHA-1 ab615e5c03 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684034
Change-Id: Ica9ed0e1d93f46da1d012e2e5a6c9ade0863a9fc
2021-04-29 05:45:59 +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
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