Commit Graph

567977 Commits

Author SHA1 Message Date
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
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
Lorenzo Colitti
5a31cd4f84 Merge "Rename unwanted capabilities to forbidden capabilities." 2021-05-12 09:00:17 +00:00
Paul Hu
2b0351ce1e Merge "Add MATCH_ANY_USER flag to PackageInfo queries" am: 68301eb7cb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689207

Change-Id: Ie4878f35faf62b15c95dc93951b9fa8f868642c4
2021-05-12 07:41:00 +00:00
David Su
9794833d6d Merge "services.net-module-wifi: Add TEST_MAPPING" am: 0885cc3db9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688406

Change-Id: I16f353fc9eaa686f1983b9a99df8055f0c265621
2021-05-12 07:35:14 +00:00
Paul Hu
68301eb7cb Merge "Add MATCH_ANY_USER flag to PackageInfo queries" 2021-05-12 07:13:17 +00:00
Yi-Yo Chiang
677dfeae2d DSUService: Deduplicate InstallUserdata() and InstallScratch()
Factor out common code and some minor polishing.

Bug: 165471299
Test: Fire a DSU installation and observe logcat
Change-Id: Ia13db74c038e49d888e69e43b59ab0ad5b078464
2021-05-12 06:58:06 +00:00
Yi-Yo Chiang
a3f91296ce DSUService: Log verbose installation progress
Log the installation progress in logcat if feasible.

Bug: 181043054
Bug: 165471299
Test: Fire a DSU installation and observe logcat
Change-Id: Ib82783f2dfe310335725f39053eaa940d96e7198
2021-05-12 14:32:18 +08:00
Cody Kesting
da188b3719 Restructure Test Network requests for VCN connections.
This CL restructures the NetworkRequests used for TestNetworks
in UnderlyingNetworkTracker to clearly show that they only require
TRANSPORT_TEST and the relevant subIds.

Bug: 182291467
Test: atest FrameworksVcnTests CtsVcnTestCases
Change-Id: I4b135749fdde9f91c66b87b1ded921700e6440fd
2021-05-11 19:27:36 -07:00
Cody Kesting
48f54d8fae Correct variable name in VcnManagementService.
Bug: 182291467
Test: atest FrameworksVcnTests CtsVcnTestCases
Change-Id: If4fcaa523e5cac85c916f7c41cef996129652a5d
2021-05-11 19:27:36 -07:00
David Su
0885cc3db9 Merge "services.net-module-wifi: Add TEST_MAPPING" 2021-05-12 01:48:32 +00:00
Cody Kesting
88c5fe5e60 Request Test Networks for VCNs when in Test Mode.
This CL updates UnderlyingNetworkTracker to request Test
Networks for route selection  when the VCN it is tracking
for is in test-mode.

Bug: 182291467
Test: atest FrameworksVcnTests CtsVcnTestCases
Change-Id: Icb59b15df61ec43fe76e250977a985caa6a1dffc
2021-05-11 18:32:32 -07:00
Cody Kesting
5f65a440e2 Specify if a VCN is in 'test-mode' in VcnContext.
This CL updates VcnContext to include whether the VCN instance
it is created for is in test-mode (as specified by the VcnConfig).
This also changes the lifetime of VcnContext to be created uniquely
for each VCN instance (as opposed to a single VcnContext created in
VcnManagementService and used for all VCNs).

Bug: 182291467
Test: atest FrameworksVcnTests CtsVcnTestCases
Change-Id: I6fc6a266bf67ab2aa64202153c3c109ee98a16ca
2021-05-11 18:32:32 -07:00
Cody Kesting
fd57083e39 Create test-mode for VcnConfig.
This CL creates a test-mode for VcnConfig so that they will only
match with Test Networks. This is necessary for CTS testing so
that VCNs can run on test networks and IKE negotiations can be
injected over the Test Networks.

Bug: 182291467
Test: atest FrameworksVcnTests CtsVcnTestCases
Change-Id: I5cc340e5aaa34c5de8efafa52de49185a18d4bd3
2021-05-11 18:32:32 -07:00
Treehugger Robot
80678b472c Merge "[DO NOT MERGE] Handle landscape and portrait display for PIP rotation" am: 316b537c9a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659166

Change-Id: I1c80dd309aa9a1401cce5b0a083507aac598355a
2021-05-12 00:48:59 +00:00
Salini Venate
250f1b8f55 [DO NOT MERGE] Handle landscape and portrait display for PIP rotation am: d7282448a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659166

Change-Id: I06add119b8e2a5cedf0c838ff0da15edb3632275
2021-05-12 00:43:33 +00:00
Treehugger Robot
316b537c9a Merge "[DO NOT MERGE] Handle landscape and portrait display for PIP rotation" 2021-05-12 00:33:54 +00:00