Ken Chen
|
bbba5b799e
|
Merge "Better log in createNativeNetwork" am: 37dec89b65 am: 4728eb0924 am: 31aef231ab am: 54fefcff7d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704925
Change-Id: I792fdda941474279fcd4d4398072fcecc64a21bb
|
2021-05-13 03:21:39 +00:00 |
|
Ken Chen
|
4bd91fd931
|
Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: a0b65e1870 am: aa243fe3ba am: 05f062fb64 am: bbe7ca9eb3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648
Change-Id: I17d2a2d07c024a8f8a3e4fedccb337c41f2f1251
|
2021-05-13 03:21:09 +00:00 |
|
Ken Chen
|
54fefcff7d
|
Merge "Better log in createNativeNetwork" am: 37dec89b65 am: 4728eb0924 am: 31aef231ab
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704925
Change-Id: I963967771fff102b25ce102c56789904d5e3c342
|
2021-05-13 02:59:56 +00:00 |
|
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
|
31aef231ab
|
Merge "Better log in createNativeNetwork" am: 37dec89b65 am: 4728eb0924
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704925
Change-Id: If8c106b8d0f2f71e47942a151de49daf1b65b852
|
2021-05-13 02:44:48 +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
|
4728eb0924
|
Merge "Better log in createNativeNetwork" am: 37dec89b65
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704925
Change-Id: Ic8afb71d7ac099f6c492dda8f9f54a5da3c79649
|
2021-05-13 02:01:21 +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
|
37dec89b65
|
Merge "Better log in createNativeNetwork"
|
2021-05-13 01:21:47 +00:00 |
|
Ken Chen
|
a0b65e1870
|
Merge "Switch from networkCreate[Physical/Vpn] to networkCreate"
|
2021-05-13 01:20:39 +00:00 |
|
Lorenzo Colitti
|
63a94a9b8d
|
Merge changes from topic "transportinfo-explicit-redaction" into sc-dev am: a8dbcb7e4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14484636
Change-Id: Ic02ed2cacd5fe3d83a8c5a2b411b37e721e766e6
|
2021-05-12 22:53:50 +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
|
e89b284436
|
[automerger skipped] Merge "Update PrivateDnsMode from StringDef to IntDef" am: 0604a2e93e am: 735250d758 am: c3ab7b66d3 -s ours am: 8b8f1c4e32 -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: I8197ba79c4cd27e3dde1e5a94c19f1a9f1fb913e
|
2021-05-12 18:49:37 +00:00 |
|
Lucas Lin
|
8df5993e9d
|
[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev am: 542d796a9f am: 36fa4a55b4 -s ours am: 8ca73028d2 -s ours am: b8aeb4dde6 -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: I78a03e5d6791616e8f114384e816be585e3c2af5
|
2021-05-12 18:49:11 +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
|
976394f0ea
|
[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev am: 542d796a9f -s ours am: b173efe01a -s ours am: de2e8bb778 -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: Ib30378da6a9f97d2617e799a9b73a544f87c2314
|
2021-05-12 18:00:49 +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
|
ab307ae695
|
Merge "Allow any transport with TEST if the network is restricted" am: 03de4e884b am: e32987bcb9 am: 6e2a3affcc am: 35d3ca1c6d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702489
Change-Id: I593e752c88b2bd2bf31d8eef9664ee9cab789505
|
2021-05-12 15:11:52 +00:00 |
|
Remi NGUYEN VAN
|
45febb22d9
|
[automerger skipped] Merge "Use jniThrowErrnoException from JNIHelp" am: 60ce73bdc5 am: cb58eb4732 am: 126dfaf776 -s ours am: feb53db5e2 -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: I9713bf2d9859a457d7e30607fd4dd3cbfc474384
|
2021-05-12 15:11:04 +00:00 |
|
Remi NGUYEN VAN
|
f6e049b635
|
[automerger skipped] Merge "Move NetworkUtils JNI out of core/jni" am: 8842198f2e am: ba0f6837cc am: 169d66303b -s ours am: 4a6ce2b3a4 -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: If0eb9788e6b6cf3a3e811a6e01d4eaf1084dcf67
|
2021-05-12 15:10:46 +00:00 |
|
Remi NGUYEN VAN
|
f6e4c5604d
|
[automerger skipped] Merge "Build framework-connectivity using module_current" am: 40d3b1fbea am: 6e64634da0 am: 32df5aa7bb -s ours am: 14032086f6 -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: I9099d771c2fc3733a413ace206d698082a9b2976
|
2021-05-12 15:10:03 +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
|
b83065eaee
|
[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" am: 536e82f56b am: d37e995263 am: 7e3fb2c18a -s ours am: d5d17ef234 -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: I8e0b829997a7f8dce16bc318ed90501f198766f1
|
2021-05-12 10:34:22 +00:00 |
|
Lorenzo Colitti
|
202f9d43d0
|
Merge "Rename unwanted capabilities to forbidden capabilities." am: dacc5e5f93 am: a50875391b am: bcede3e59b am: 6da4650c89
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687485
Change-Id: I5e396ce812da9f1ef05281c6f4e3fe100606e66f
|
2021-05-12 10:33:37 +00:00 |
|
Paul Hu
|
7e1af8e985
|
Merge "Add MATCH_ANY_USER flag to PackageInfo queries" am: eda29f73aa am: 8f03d96e83 am: d59739e116 am: 144ae528e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689207
Change-Id: Ieb65ba4365b61688aa8f0d250fc16acf66f8a4fd
|
2021-05-12 10:33:06 +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 |
|