Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
567,996 Commits 3 Branches 0 Tags
fe7e35ea075a313dc3c98a8ab29052ae75f5e916
Commit Graph

567996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Hu
fe7e35ea07 Merge "Add RESTRICTED_ALLOWED_APPS setting" am: e6d2b4663e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689208

Change-Id: I93c004e7356559436c7dbd95716e52db8fc1ba0d
 2021-05-13 05:54:31 +00:00
Paul Hu
e6d2b4663e Merge "Add RESTRICTED_ALLOWED_APPS setting" 2021-05-13 05:32:19 +00:00
Linzhao Ye
0e751cd213 Merge changes Id9a9451a,Idf113709 am: 03a24f50cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702072

Change-Id: Ie027778a90deb5a3956f0e1dc9cbf462c9a4b50e
 2021-05-13 04:53:17 +00:00
Linzhao Ye
03a24f50cc Merge changes Id9a9451a,Idf113709 
* changes:
  Change the brackets in Persian keyboard layout.
  Change the brackets in Hebrew keyboard layout.
 2021-05-13 04:33:11 +00:00
Treehugger Robot
ad73e362f0 Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." am: fa8d51d5a6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706447

Change-Id: I1e18b1b6c51ea0bb4c9db9623259161a75781f29
 2021-05-13 02:11:32 +00:00
paulhu
5ee5670cc1 Add RESTRICTED_ALLOWED_APPS setting 
This setting is OEM upstream requirement for third party apps
using restricted networks.

Bug: 185149952
Test: atests FrameworksNetTests
Change-Id: I5e16b46cf2935f38ee1e516bb8b85fa487cf9f61
 2021-05-13 10:09:31 +08: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
Treehugger Robot
fa8d51d5a6 Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." 2021-05-13 01:57:26 +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
Janis Danisevskis
04d5622233 Keystore 2.0 SPI: Silence warning about blocking calls to Keystore. 
Test: N/A
Bug: 184108046
Change-Id: I7401b88e5055cb781113656021f3ec274d1951a4
 2021-05-12 16:53:14 -07: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
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
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
1742bf024c Merge "Update PrivateDnsMode from StringDef to IntDef" 2021-05-12 17:09:50 +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
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
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
432f868e78 Merge "audio:fix STREAM_SYSTEM_ENFORCED index when camera sound forced" am: 74e618ff8b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702488

Change-Id: I4a09b92dcc9d06265faa6eb9bafb42b8ca36214b
 2021-05-12 12:41:17 +00:00
Eric Laurent
74e618ff8b Merge "audio:fix STREAM_SYSTEM_ENFORCED index when camera sound forced" 2021-05-12 12:25:23 +00:00
Nathalie Le Clair
1d5d3ca3cf Add lcnathalie to OWNERS 
Bug: N/A
Test: N/A
Change-Id: I369963eb006affb24cba0ab9ef97ec797396fc53
 2021-05-12 13:47:10 +02:00
Treehugger Robot
b24386b51f Merge "DSUService: Log verbose installation progress" am: 4463102095 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662401

Change-Id: I948e7c49d857083d6e3aacfd38d992da557d998c
 2021-05-12 10:10:37 +00:00
Siim Sammul
65c37c7b1c Merge "Store the collected binder latency samples in buckets to form a histogram. Add the ability to generate histograms with varying bucket counts and sizes." am: e3873010be 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703090

Change-Id: I2dea63d0e1de50e211ace34def0ca770b1c0a3ad
 2021-05-12 10:07:05 +00:00
Yo Chiang
5f2f17fc4a Merge "DSUService: Deduplicate InstallUserdata() and InstallScratch()" am: c2c3a3c7d4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662402

Change-Id: Ifd3f768bd8fbda78a8909f0eca01da4fbf609cbf
 2021-05-12 10:02:17 +00:00
Chiachang Wang
fc1928cedb Merge "Remove sendNetworkConditionsBroadcast" am: 6a6fa67d58 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702485

Change-Id: I858f2364a40d409981b88946887f9619f11cdce4
 2021-05-12 09:57:07 +00:00
Treehugger Robot
4463102095 Merge "DSUService: Log verbose installation progress" 2021-05-12 09:52:05 +00:00
Siim Sammul
e3873010be Merge "Store the collected binder latency samples in buckets to form a histogram. Add the ability to generate histograms with varying bucket counts and sizes." 2021-05-12 09:40:18 +00:00
Yo Chiang
c2c3a3c7d4 Merge "DSUService: Deduplicate InstallUserdata() and InstallScratch()" 2021-05-12 09:39:04 +00:00
Ken Chen
bf8bf735d6 Add testVpnTypesEqual to verify consistency 
VPN types are defined in both VpnManager.java and NativeVpnType.aidl.
The definitions on both sides should match (except TYPE_VPN_NONE).

VpnManager.java:
TYPE_VPN_NONE = -1
TYPE_VPN_SERVICE = 1
TYPE_VPN_PLATFORM = 2
TYPE_VPN_LEGACY = 3
TYPE_VPN_OEM = 4

NativeVpnType.aidl:
SERVICE = 1
PLATFORM = 2
LEGACY = 3
OEM = 4

Bug: N/A
Test: atest android.net.VpnManagerTest#testVpnTypesEqual
Change-Id: Ie618e227d861100c5318da696140e486af1093a0
 2021-05-12 17:34:34 +08:00
Chiachang Wang
6a6fa67d58 Merge "Remove sendNetworkConditionsBroadcast" 2021-05-12 09:24:02 +00:00
Lorenzo Colitti
0bcf2d1408 Merge "Rename unwanted capabilities to forbidden capabilities." am: 5a31cd4f84 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687485

Change-Id: Iaf8da730305ed7294cc624d4d41b0a11f2872863
 2021-05-12 09:15:30 +00:00