Ken Chen
bbe7ca9eb3
Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: a0b65e1870 am: aa243fe3ba am: 05f062fb64
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648
Change-Id: I3475e674c3914c4c61fd0a4246c9ee3e7e02c4fb
2021-05-13 02:59:30 +00:00
Ken Chen
05f062fb64
Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: a0b65e1870 am: aa243fe3ba
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648
Change-Id: Iec819a213f8c0daf50cdfdd5d580234ee5f8de68
2021-05-13 02:44:30 +00:00
Ken Chen
aa243fe3ba
Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: a0b65e1870
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648
Change-Id: Ia7b8d56ee75194cfe289dbb3e73667f43344cda3
2021-05-13 01:34:23 +00:00
Ken Chen
a0b65e1870
Merge "Switch from networkCreate[Physical/Vpn] to networkCreate"
2021-05-13 01:20:39 +00:00
Lorenzo Colitti
a8dbcb7e4c
Merge changes from topic "transportinfo-explicit-redaction" into sc-dev
...
* changes:
Immediately redact VcnTransportInfo.
Do not automatically redact TransportInfo objects.
2021-05-12 22:46:36 +00:00
Lucas Lin
8b8f1c4e32
[automerger skipped] Merge "Update PrivateDnsMode from StringDef to IntDef" am: 0604a2e93e am: 735250d758 am: c3ab7b66d3 -s ours
...
am skip reason: Merged-In I23e7ec140066979726d769cabc5f7057bb2167e6 with SHA-1 3077988ad2 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675562
Change-Id: I6bf6c1259a83fb9763b286941b7df8fe6e491bcf
2021-05-12 18:24:14 +00:00
Lucas Lin
b8aeb4dde6
[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev am: 542d796a9f am: 36fa4a55b4 -s ours am: 8ca73028d2 -s ours
...
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 266d39b4cb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14455604
Change-Id: Ie39cad37ac044cb34c4cf46348904260c31ac3c2
2021-05-12 18:23:37 +00:00
Lucas Lin
de2e8bb778
[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev am: 542d796a9f -s ours am: b173efe01a -s ours
...
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 792f554dc9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14455604
Change-Id: I67136183ff603f3a8028dbc538dc2176dc650ce7
2021-05-12 17:59:59 +00:00
Lucas Lin
c3ab7b66d3
Merge "Update PrivateDnsMode from StringDef to IntDef" am: 0604a2e93e am: 735250d758
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675562
Change-Id: I0b2ad20c59397395175b82688cfe657af43a1b19
2021-05-12 17:59:57 +00:00
Lucas Lin
8ca73028d2
[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev am: 542d796a9f am: 36fa4a55b4 -s ours
...
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 d6f8dbd75b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14455604
Change-Id: I27cd7672349c0f1f4c4831c3c3cab720720ac373
2021-05-12 17:59:35 +00:00
Lucas Lin
735250d758
Merge "Update PrivateDnsMode from StringDef to IntDef" am: 0604a2e93e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675562
Change-Id: I391d8dd2615f090d3112af69248aea70e334f62f
2021-05-12 17:23:45 +00:00
Lucas Lin
b173efe01a
[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev am: 542d796a9f -s ours
...
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 792f554dc9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14455604
Change-Id: I977a5bdbf0c320a83075a17208abb68aab52ff2d
2021-05-12 17:22:58 +00:00
Lucas Lin
36fa4a55b4
Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev am: 542d796a9f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14455604
Change-Id: I4a64821743d6ee4e4ae9b9d2759e38369cde5656
2021-05-12 17:21:55 +00:00
Lucas Lin
0604a2e93e
Merge "Update PrivateDnsMode from StringDef to IntDef"
2021-05-12 17:09:50 +00:00
Chalard Jean
35d3ca1c6d
Merge "Allow any transport with TEST if the network is restricted" am: 03de4e884b am: e32987bcb9 am: 6e2a3affcc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702489
Change-Id: Ib8ee3109ba5525ce1b1c6c2bd5ebcdc0b48a5319
2021-05-12 14:44:30 +00:00
Remi NGUYEN VAN
feb53db5e2
[automerger skipped] Merge "Use jniThrowErrnoException from JNIHelp" am: 60ce73bdc5 am: cb58eb4732 am: 126dfaf776 -s ours
...
am skip reason: Merged-In I257a9d55ce1f5a7c588e209b4a89d3e7a3e09994 with SHA-1 eb0e59193e 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
4a6ce2b3a4
[automerger skipped] Merge "Move NetworkUtils JNI out of core/jni" am: 8842198f2e am: ba0f6837cc am: 169d66303b -s ours
...
am skip reason: Merged-In I0b55dfe92f3cb6e848d79ac7953756f39aaa2597 with SHA-1 8f0031d7aa 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
14032086f6
[automerger skipped] Merge "Build framework-connectivity using module_current" am: 40d3b1fbea am: 6e64634da0 am: 32df5aa7bb -s ours
...
am skip reason: Merged-In I2d51d37d067bf6fe86e4dedf05855a2dd67ed57c with SHA-1 2a311db05b 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
Chalard Jean
6e2a3affcc
Merge "Allow any transport with TEST if the network is restricted" am: 03de4e884b am: e32987bcb9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702489
Change-Id: I8b42aa698f279774b8d5781811dc848c7d7ff713
2021-05-12 14:33:13 +00:00
Chalard Jean
e32987bcb9
Merge "Allow any transport with TEST if the network is restricted" am: 03de4e884b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702489
Change-Id: Ic688c9d328242962c57631632b33236a69852ed6
2021-05-12 14:29:56 +00:00
Remi NGUYEN VAN
126dfaf776
Merge "Use jniThrowErrnoException from JNIHelp" am: 60ce73bdc5 am: cb58eb4732
...
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
169d66303b
Merge "Move NetworkUtils JNI out of core/jni" am: 8842198f2e am: ba0f6837cc
...
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
32df5aa7bb
Merge "Build framework-connectivity using module_current" am: 40d3b1fbea am: 6e64634da0
...
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
cb58eb4732
Merge "Use jniThrowErrnoException from JNIHelp" am: 60ce73bdc5
...
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
ba0f6837cc
Merge "Move NetworkUtils JNI out of core/jni" am: 8842198f2e
...
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
6e64634da0
Merge "Build framework-connectivity using module_current" am: 40d3b1fbea
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703085
Change-Id: I67461b530e5292f94e3e1426ff0ec93ea657cf21
2021-05-12 14:05:55 +00:00
Chalard Jean
03de4e884b
Merge "Allow any transport with TEST if the network is restricted"
2021-05-12 13:57:31 +00:00
Remi NGUYEN VAN
60ce73bdc5
Merge "Use jniThrowErrnoException from JNIHelp"
2021-05-12 13:12:32 +00:00
Remi NGUYEN VAN
8842198f2e
Merge "Move NetworkUtils JNI out of core/jni"
2021-05-12 13:12:09 +00:00
Remi NGUYEN VAN
40d3b1fbea
Merge "Build framework-connectivity using module_current"
2021-05-12 13:11:22 +00:00
Chiachang Wang
d5d17ef234
[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" am: 536e82f56b am: d37e995263 am: 7e3fb2c18a -s ours
...
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 792f554dc9 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702485
Change-Id: Ic88418e136ccd5bfb691f5ea02c7c01e3a8bd4a5
2021-05-12 10:20:58 +00:00
Lorenzo Colitti
6da4650c89
Merge "Rename unwanted capabilities to forbidden capabilities." am: dacc5e5f93 am: a50875391b am: bcede3e59b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687485
Change-Id: I9fcfd474b0cebdbadaad9466f5fb15b0069b55e6
2021-05-12 10:20:22 +00:00
Paul Hu
144ae528e9
Merge "Add MATCH_ANY_USER flag to PackageInfo queries" am: eda29f73aa am: 8f03d96e83 am: d59739e116
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689207
Change-Id: Ie3dd72aa4b8166198884f348f59c77befc229dc0
2021-05-12 10:19:57 +00:00
Chiachang Wang
7e3fb2c18a
Merge "Remove sendNetworkConditionsBroadcast" am: 536e82f56b am: d37e995263
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702485
Change-Id: Ib6299c1022f196453aa6f072bcc9ba7227bfe8f4
2021-05-12 10:04:29 +00:00
Chiachang Wang
d37e995263
Merge "Remove sendNetworkConditionsBroadcast" am: 536e82f56b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702485
Change-Id: I858f2364a40d409981b88946887f9619f11cdce4
2021-05-12 09:57:07 +00:00
Lorenzo Colitti
bcede3e59b
Merge "Rename unwanted capabilities to forbidden capabilities." am: dacc5e5f93 am: a50875391b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687485
Change-Id: I9b8a61b4c4a0059af294c2575e5339e7e3b9f3ed
2021-05-12 09:56:38 +00:00
Paul Hu
d59739e116
Merge "Add MATCH_ANY_USER flag to PackageInfo queries" am: eda29f73aa am: 8f03d96e83
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689207
Change-Id: I44318046f675749fe056fa253da3d48c88129441
2021-05-12 09:56:19 +00:00
Chiachang Wang
536e82f56b
Merge "Remove sendNetworkConditionsBroadcast"
2021-05-12 09:24:02 +00:00
Lorenzo Colitti
a50875391b
Merge "Rename unwanted capabilities to forbidden capabilities." am: dacc5e5f93
...
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
dacc5e5f93
Merge "Rename unwanted capabilities to forbidden capabilities."
2021-05-12 09:00:17 +00:00
Paul Hu
8f03d96e83
Merge "Add MATCH_ANY_USER flag to PackageInfo queries" am: eda29f73aa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689207
Change-Id: Ie4878f35faf62b15c95dc93951b9fa8f868642c4
2021-05-12 07:41:00 +00:00
Paul Hu
eda29f73aa
Merge "Add MATCH_ANY_USER flag to PackageInfo queries"
2021-05-12 07:13:17 +00:00
David Su
318f23c5c8
Merge "Emphasize possibility of multiple networks with same transport" am: 74adc3a813 am: a7472710a5 am: 197900e62e
...
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
197900e62e
Merge "Emphasize possibility of multiple networks with same transport" am: 74adc3a813 am: a7472710a5
...
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
a7472710a5
Merge "Emphasize possibility of multiple networks with same transport" am: 74adc3a813
...
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
74adc3a813
Merge "Emphasize possibility of multiple networks with same transport"
2021-05-11 15:51:28 +00:00
Orion Hodson
1067c82274
Merge "Move to renamed NDK symbol AFileDescriptor_getFd" into sc-dev
2021-05-11 14:31:42 +00:00
Remi NGUYEN VAN
bf0edd457f
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
Lorenzo Colitti
b8756a814e
Do not automatically redact TransportInfo objects.
...
Currently, NetworkCapabilities always redacts the TransportInfo
objects it contains whenever a defensive copy is made. This makes
it impossible to make a defensive copy on a TransportInfo
parcelled from another process without redacting it.
Stop redacting by default; instead rely on ConnectivityService
explicitly calling NetworkCapabilities' redacting constructor
when it returns a NetworkCapabilities object to an app via a
callback or synchronous call. This is currently done by
- createWithLocationInfoSanitizedIfNecessaryWhenParceled, which
is called from callCallbackForRequest, getNetworkCapabilities,
and getDefaultNetworkCapabilitiesForUser.
- getNetworkCapabilitiesWithoutUids, which is used when sending
ConnectivityDiagnosticsManager callbacks. In this method,
unconditionally redact all information, which is what the code
did previously due to the default redaction setting for empty
NetworkCapabilities objects being REDACT_ALL.
Bug: 183938194
Test: atest NetworkCapabilitiesTest
Test: atest FrameworksNetTests CtsNetTestCases HostsideVpnTests
Change-Id: I3108ee94cb0930958e071ba678c3554525b0db82
2021-05-11 22:47:03 +09:00
Remi NGUYEN VAN
40330008c3
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