Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
571,054 Commits 3 Branches 0 Tags
233682e67511e30029e68d7de24dac448a810c19
Commit Graph

571054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ken Chen
233682e675 Merge "Add testVpnTypesEqual to verify consistency" am: 785dc4871c am: 3ae939569e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705385

Change-Id: Id2e9d16c88088ef5d3ffe6f698af5ee8201c7716
 2021-05-13 02:45:06 +00:00
Ken Chen
4be8e66448 Merge "Better log in createNativeNetwork" am: bd0ba5d94b am: d0ab30add0 
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
a4d53bfa6d Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: c9d5cd9fbc am: 62258932ff 
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
3ae939569e Merge "Add testVpnTypesEqual to verify consistency" am: 785dc4871c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705385

Change-Id: I18b5716252efc4f7c33ec8263c09df1f9396d1fe
 2021-05-13 02:05:37 +00:00
Ken Chen
d0ab30add0 Merge "Better log in createNativeNetwork" am: bd0ba5d94b 
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
62258932ff Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: c9d5cd9fbc 
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
785dc4871c Merge "Add testVpnTypesEqual to verify consistency" 2021-05-13 01:22:08 +00:00
Ken Chen
bd0ba5d94b Merge "Better log in createNativeNetwork" 2021-05-13 01:21:47 +00:00
Ken Chen
c9d5cd9fbc Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" 2021-05-13 01:20:39 +00:00
Cody Kesting
5cdc27d2ac Merge changes I4b135749,If4fcaa52 am: 576dad4673 am: cd4e6ae6d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704175

Change-Id: I31a2eda921b88ebe0c70492e39f4b448f6c91b93
 2021-05-12 23:15:28 +00:00
Linzhao Ye
c985b4066c Merge "Change the '[]' and '<>' brackets in Arabic keyboard layout." am: 5c1879cb60 am: 27095d7536 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702070

Change-Id: Ie7d9c32025213c7fc089dff38be142caa15df9c7
 2021-05-12 23:15:14 +00:00
Cody Kesting
cd4e6ae6d6 Merge changes I4b135749,If4fcaa52 am: 576dad4673 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704175

Change-Id: Iad5fd7d7e39cb0a19f7fc87b09c600a7e7b7ecd8
 2021-05-12 23:03:26 +00:00
Linzhao Ye
27095d7536 Merge "Change the '[]' and '<>' brackets in Arabic keyboard layout." am: 5c1879cb60 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702070

Change-Id: I5623a9e742efc094418e91e9c830e8c08691f3ba
 2021-05-12 23:00:31 +00:00
Cody Kesting
576dad4673 Merge changes I4b135749,If4fcaa52 
* changes:
  Restructure Test Network requests for VCN connections.
  Correct variable name in VcnManagementService.
 2021-05-12 22:55:17 +00:00
Aurimas Liutikas
51a1b7d082 Merge "Revert "Fix incompatibilities with Kotlin 1.5.0"" am: f1e2bb9a81 am: c2db9c85cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705633

Change-Id: I39fdc7fb9ad8109e51e2d3bdee1bc4fb3354a247
 2021-05-12 22:52:55 +00:00
Linzhao Ye
5c1879cb60 Merge "Change the '[]' and '<>' brackets in Arabic keyboard layout." 2021-05-12 22:44:31 +00:00
Aurimas Liutikas
c2db9c85cc Merge "Revert "Fix incompatibilities with Kotlin 1.5.0"" am: f1e2bb9a81 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705633

Change-Id: Ic447f14fbeab4215efc758f301b626bc21766b31
 2021-05-12 22:20:32 +00:00
Aurimas Liutikas
f1e2bb9a81 Merge "Revert "Fix incompatibilities with Kotlin 1.5.0"" 2021-05-12 22:03:25 +00:00
Aurimas Liutikas
c5b4071877 Revert "Fix incompatibilities with Kotlin 1.5.0" 
This reverts commit b8ca1157ab.

Reason for revert: b/187908823

Change-Id: I9606c5730f4e8697a9319939acda0a9b7a74634d
 2021-05-12 21:56:31 +00:00
Automerger Merge Worker
47592cbcee Merge "[automerger skipped] Merge "Ensure storage permission revoke happens for all users" into rvc-qpr-dev am: 9e639ddde5 -s ours" into rvc-qpr-dev-plus-aosp 2021-05-12 18:00:23 +00:00
Nate Myren
fb59f47f72 [automerger skipped] Merge "Ensure storage permission revoke happens for all users" into rvc-qpr-dev am: 9e639ddde5 -s ours 
am skip reason: Merged-In Ieb8bb9cde1576e9eee131338d393b8a3528341ec with SHA-1 37acd7ee52 is already in history

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

Change-Id: I7974e5eff334a11b6d03293562d9aefce0adf211
 2021-05-12 18:00:03 +00:00
Lucas Lin
9df8482c78 Merge "Update PrivateDnsMode from StringDef to IntDef" am: 1742bf024c am: eb6daaa8af 
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
e9e500a82b [automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev am: 542d796a9f am: 6f53003c47 -s ours 
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 bfb3e5088f 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
Nate Myren
9e639ddde5 Merge "Ensure storage permission revoke happens for all users" into rvc-qpr-dev 2021-05-12 17:24:06 +00:00
Lucas Lin
eb6daaa8af Merge "Update PrivateDnsMode from StringDef to IntDef" am: 1742bf024c 
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
6f53003c47 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
1742bf024c Merge "Update PrivateDnsMode from StringDef to IntDef" 2021-05-12 17:09:50 +00:00
Lucas Lin
542d796a9f Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev 2021-05-12 17:08:42 +00:00
Treehugger Robot
32c2d34383 Merge changes Icb59b15d,I6fc6a266,I5cc340e5,I94db52a8 am: b79dcb24d0 am: 5804521e8c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700309

Change-Id: I0c8987358edd0d77965507819e81faa21daaf767
 2021-05-12 17:01:13 +00:00
Treehugger Robot
5804521e8c Merge changes Icb59b15d,I6fc6a266,I5cc340e5,I94db52a8 am: b79dcb24d0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700309

Change-Id: I76cc66f33740b519441658d0d1d631882cf4e126
 2021-05-12 16:36:51 +00:00
Treehugger Robot
b79dcb24d0 Merge changes Icb59b15d,I6fc6a266,I5cc340e5,I94db52a8 
* changes:
  Request Test Networks for VCNs when in Test Mode.
  Specify if a VCN is in 'test-mode' in VcnContext.
  Create test-mode for VcnConfig.
  Require MOBIKE for IkeSessionParams in VCN configs.
 2021-05-12 16:21:25 +00:00
Chalard Jean
6cc8dc45c7 Merge "Allow any transport with TEST if the network is restricted" am: 7e9223a751 am: a76cc4e98d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702489

Change-Id: I8b42aa698f279774b8d5781811dc848c7d7ff713
 2021-05-12 14:33:13 +00:00
Treehugger Robot
d52c25c2bd Merge "Add lcnathalie to OWNERS" am: d7158e25d6 am: 3c351fd63c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705352

Change-Id: Iff6217a949282bd89a006d7a8970ab2638cdb538
 2021-05-12 14:33:04 +00:00
satayev
c792a3d96b Merge "Expose SharedLibraryInfo#getAllCodePaths as @TestApi." am: 3f955dda5c am: db47bd0c94 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703011

Change-Id: Idc02f14de952608b9a0a8ce4417576eea3d09ef5
 2021-05-12 14:32:33 +00:00
Chalard Jean
a76cc4e98d Merge "Allow any transport with TEST if the network is restricted" am: 7e9223a751 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702489

Change-Id: Ic688c9d328242962c57631632b33236a69852ed6
 2021-05-12 14:29:56 +00:00
Treehugger Robot
3c351fd63c Merge "Add lcnathalie to OWNERS" am: d7158e25d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705352

Change-Id: Icc45ed9b5517194076b18958c898c515948b4fc3
 2021-05-12 14:26:26 +00:00
Remi NGUYEN VAN
73ca3ed15d Merge "Use jniThrowErrnoException from JNIHelp" am: eff6bb9c48 am: 51a05fdd14 
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
1d78211ffb Merge "Move NetworkUtils JNI out of core/jni" am: 44862ff783 am: 0386387d39 
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
1778eda40a Merge "Build framework-connectivity using module_current" am: ea96653e66 am: 719ae7062d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703085

Change-Id: I47046e76bab062d0f887f2f965c054054acba0c5
 2021-05-12 14:25:00 +00:00
satayev
db47bd0c94 Merge "Expose SharedLibraryInfo#getAllCodePaths as @TestApi." am: 3f955dda5c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703011

Change-Id: I0ef56b657d6090b755750ca23211954f4d57e113
 2021-05-12 14:20:49 +00:00
Remi NGUYEN VAN
51a05fdd14 Merge "Use jniThrowErrnoException from JNIHelp" am: eff6bb9c48 
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
0386387d39 Merge "Move NetworkUtils JNI out of core/jni" am: 44862ff783 
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
719ae7062d Merge "Build framework-connectivity using module_current" am: ea96653e66 
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
7e9223a751 Merge "Allow any transport with TEST if the network is restricted" 2021-05-12 13:57:31 +00:00
Treehugger Robot
d7158e25d6 Merge "Add lcnathalie to OWNERS" 2021-05-12 13:47:04 +00:00
satayev
3f955dda5c Merge "Expose SharedLibraryInfo#getAllCodePaths as @TestApi." 2021-05-12 13:21:24 +00:00
Remi NGUYEN VAN
eff6bb9c48 Merge "Use jniThrowErrnoException from JNIHelp" 2021-05-12 13:12:32 +00:00
Remi NGUYEN VAN
44862ff783 Merge "Move NetworkUtils JNI out of core/jni" 2021-05-12 13:12:09 +00:00
Remi NGUYEN VAN
ea96653e66 Merge "Build framework-connectivity using module_current" 2021-05-12 13:11:22 +00:00
Eric Laurent
c80912849e Merge "audio:fix STREAM_SYSTEM_ENFORCED index when camera sound forced" am: 74e618ff8b am: 432f868e78 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702488

Change-Id: I9af7417eb8b65d6e0c4526882fe16a4e8de6df78
 2021-05-12 13:04:01 +00:00