Commit Graph

561369 Commits

Author SHA1 Message Date
Tianjie Xu
44593bf4ac Merge "Add shell command to set package" am: 11b13adfb7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560109

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I55b5612e4b93039718e13b8ef08165f156708099
2021-02-10 21:56:26 +00:00
Tianjie Xu
11b13adfb7 Merge "Add shell command to set package" 2021-02-10 21:23:53 +00:00
Tianjie Xu
03b0f9ca87 Merge "Reset binder during unbinding" am: eda5da6b92
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580986

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51950d4e58ded2218a317b7a3ad1983bd6986bed
2021-02-10 19:28:37 +00:00
Yan Yan
32420c3397 Merge changes from topic "ike-bcp" am: 073c6fa957
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05a7cc5ac68c6fa1c552ae0276e5019f9e94daed
2021-02-10 19:24:05 +00:00
Yan Yan
b587eebfee Add IKE stub to main Android SDK am: f8b973c3f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573900

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4316d201a5c253ef9c73505943b21e1d0141bbb9
2021-02-10 19:20:15 +00:00
Tianjie Xu
eda5da6b92 Merge "Reset binder during unbinding" 2021-02-10 18:46:50 +00:00
Tianjie
dc2b792589 Reset binder during unbinding
On some rare case, we may encounter a DeadObjectException on wrap()
when a new test app is installed. This happens because we reuse the
binder from the previous bindToService() call. Always reset the
binder to make sure this doesn't happen.

Bug: 172780686
Test: run storeRebootEscrowKey twice

Change-Id: I36150ef39f870e38a5f1b4bd814465d70f8dbf85
2021-02-10 18:46:42 +00:00
Yan Yan
073c6fa957 Merge changes from topic "ike-bcp"
* changes:
  Ignore "android.net.ipsec.ike" <uses-library> tag
  Add IKE stub to main Android SDK
2021-02-10 18:41:41 +00:00
Treehugger Robot
7d360a08a0 Merge changes from topic "b/167709539" am: ad688d3e8c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564601

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b479ecc6524c0c1ba24bee365ccc07a7e88d1f7
2021-02-10 18:09:05 +00:00
Hridya Valsaraju
8bff83e9ff Add total size of DMA-BUFs exported to 'dumpsys meminfo' am: 363d44d7a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564878

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17fd9f11e20e1c1ac216cff4224298d7fd7c2a00
2021-02-10 18:06:27 +00:00
Hridya Valsaraju
8ce7111610 Rename getIonMappedSizeKb to getDmabufMappedSizeKb am: 6ae0be89b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1576749

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I892f92e8fa37d0f71f679c633b59b5c9523547ff
2021-02-10 18:03:59 +00:00
Treehugger Robot
ad688d3e8c Merge changes from topic "b/167709539"
* changes:
  Add total DMA-BUF heap pool size information to dumpsys meminfo
  Add total size of DMA-BUFs exported to 'dumpsys meminfo'
  Rename getIonMappedSizeKb to getDmabufMappedSizeKb
2021-02-10 17:37:30 +00:00
Benjamin Franz
ebb589a5a2 Merge "Add OWNERS file to core/java/android/app/compat" am: efea156fe5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb87151ce9bb77352a31f92352d53b9504de0940
2021-02-10 16:31:57 +00:00
Benjamin Franz
efea156fe5 Merge "Add OWNERS file to core/java/android/app/compat" 2021-02-10 15:49:10 +00:00
Hai Shalom
9a7b2907a9 Merge "Support for Terms & Conditions notification" am: c1e52b8003
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557451

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibabb4e549706c5ab263aab9df78c9e5a0bff95de
2021-02-10 15:40:25 +00:00
Søren Gjesse
4329977e67 Merge "Update test expectations with changed names of D8 synthetics" am: e95ab5e3dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580529

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96f9bb580ff13c7e4ab35bb3271d435b992a09a5
2021-02-10 15:37:04 +00:00
Hai Shalom
c1e52b8003 Merge "Support for Terms & Conditions notification" 2021-02-10 15:36:58 +00:00
Søren Gjesse
e95ab5e3dd Merge "Update test expectations with changed names of D8 synthetics" 2021-02-10 15:21:00 +00:00
Benjamin Franz
9d5d929b00 Add OWNERS file to core/java/android/app/compat
Bug: 174043039
Test: N/A
Change-Id: I308f85edee7b8e01f15e2ee632941bd29cd5d212
2021-02-10 10:47:17 +00:00
Lorenzo Colitti
70e0f6035a Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo" am: 250855cb84
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83b4210780cf87006be5f55439ade06cd7893530
2021-02-10 06:55:56 +00:00
Lorenzo Colitti
250855cb84 Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo"
* changes:
  Stop using mVpns in getConnectionOwnerUid.
  Add a VpnTransportInfo object.
  Add a registerSystemDefaultNetworkCallback method.
2021-02-10 06:38:41 +00:00
Hridya Valsaraju
365ffff4b5 Add total DMA-BUF heap pool size information to dumpsys meminfo
Some DMA-BUF heaps maintain pools of pre-zeroed memory for faster
allocations. Print the total size of all DMA-BUF heap pools as part of
dumpsys meminfo and use the same in LostRam calculation.

Test: dumpsys meminfo
Bug: 167709539
Change-Id: Ifb61fe596c1a8fab1bd536ec904285e532629b71
Merged-In: Ifb61fe596c1a8fab1bd536ec904285e532629b71
2021-02-10 06:05:36 +00:00
Hridya Valsaraju
363d44d7a0 Add total size of DMA-BUFs exported to 'dumpsys meminfo'
When ION support is not detected, print the total size of DMA-BUFs
exported as part of dumpsys meminfo.

Bug: 167709539
Test: dumpsys meminfo
Change-Id: I3439a8f00cf1aef37e5043b505ed53d47a8a4756
Merged-In: I3439a8f00cf1aef37e5043b505ed53d47a8a4756
2021-02-10 06:05:02 +00:00
Hridya Valsaraju
6ae0be89b9 Rename getIonMappedSizeKb to getDmabufMappedSizeKb
The function is actually calculating the total mapped DMA-BUF memory.

Test: dumpsys meminfo
Bug: 167709539
Change-Id: I5c19dc604cf48c3d7ccbfd2d9a83ddd7b35f20d5
Merged-In: I5c19dc604cf48c3d7ccbfd2d9a83ddd7b35f20d5
2021-02-10 06:04:12 +00:00
Tianjie
6a0d50dd2e Add shell command to set package
Adds an override to set the resume on reboot service provider. This
is needed to run CTS test with fake implementation. Note we won't
change the implementation provider once the resume on reboot flow
starts.

Bug: 178014912
Test: adb shell cmd lock_settings set-resume-on-reboot-provider-package com.android.cts.encryptionap;
      check the implementation is found correctly

Change-Id: I4ed6d4f25f30b5c3db4e8776f6fe4a0cd1a2793c
2021-02-09 20:24:49 -08:00
Benedict Wong
ddc40b5ce2 Merge "Restrict Carrier Wifi while VCN is configured & privileged" am: c84bc1f13c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581070

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8c30dd5ba2ed98c3b308a7213bfca10f214d0d3
2021-02-10 04:02:07 +00:00
Benedict Wong
c84bc1f13c Merge "Restrict Carrier Wifi while VCN is configured & privileged" 2021-02-10 03:27:58 +00:00
Lorenzo Colitti
c30b637f54 Merge "Switch SystemUI from IConnectivityManager to VpnManager." am: 0b303f2d15
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadeb816ad6abce5d9a0405ae0f9a81139a6473c2
2021-02-10 02:44:46 +00:00
Benedict Wong
cebde1ed9a Restrict Carrier Wifi while VCN is configured & privileged
This change removes the NOT_RESTRICTED capability for Carrier Wifi. This
is done even if a VCN is in safe mode, but will ONLY be performed if the
VCN is provisioned, and has the appropriate carrier privileges to run.

This change also fixes a test bug where the NOT_VCN_MANAGED capability
was not present in the query to getUnderlyingNetworkPolicy(), and
therefore was incorrectly passing.

Bug: 163432273
Test: atest FrameworksVcnTests
Change-Id: Iecb827b5341bdeb93ef8692c1d62f0eaf9d416ba
2021-02-09 18:43:21 -08:00
Lorenzo Colitti
0b303f2d15 Merge "Switch SystemUI from IConnectivityManager to VpnManager." 2021-02-10 01:57:46 +00:00
Yan Yan
e4fc06b9db Ignore "android.net.ipsec.ike" <uses-library> tag
"android.net.ipsec.ike" is converted from a shared library to a jar
in boot classpath since S. This CL makes package manager to ignore
<uses-library name="android.net.ipsec.ike"> to avoid loading the
jar again from the app class loader.

Bug: 177266501
Test: build, flash, boot
Test: AndroidNetIpSecIkeUpdaterTest, PackageBackwardCompatibilityTest
Change-Id: I05c8c46f102b01945724077830dc9871ab407c1d
Merged-In: I05c8c46f102b01945724077830dc9871ab407c1d
2021-02-09 17:26:10 -08:00
Yan Yan
f8b973c3f6 Add IKE stub to main Android SDK
This CL is required for converting IKE from a shared library to
a jar in the boot classpath.

Bug: 177266501
Test: build, flash, boot
Change-Id: I10759d22eaba4861b7d7f283b551156f09f54675
Merged-In: I10759d22eaba4861b7d7f283b551156f09f54675
2021-02-09 17:23:55 -08:00
Cody Kesting
3b1c79bdc9 Merge "Fix PolicyListener testing surface." am: c5bc3bcd8f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cf14631522a25f64939f67bcd5b65300f657213
2021-02-09 23:40:45 +00:00
Cody Kesting
c5bc3bcd8f Merge "Fix PolicyListener testing surface." 2021-02-09 23:03:25 +00:00
Brad Ebinger
d4a311a5b9 Merge "[RCS UCE] Expose the IMS RCS feature APIs" am: a7f8e8fe6e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562892

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I543ac89d821aeb92ac12b1049b5d269c50a8764f
2021-02-09 22:34:59 +00:00
Pavel Grafov
23db5bf15b Merge "Make getKeyStoreForUid convert uid to namespace." am: fd1b9aa4cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573441

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a4b33a1b734a63fe206f41425fd31fcb234d476
2021-02-09 22:30:04 +00:00
Treehugger Robot
ea3212b762 Merge "Update idmap2_tests to really work host-side" am: 8ae2344540
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2ec101728830ba75bc1dc1a75cfdd5ef2af72c7
2021-02-09 22:23:21 +00:00
Brad Ebinger
a7f8e8fe6e Merge "[RCS UCE] Expose the IMS RCS feature APIs" 2021-02-09 22:21:09 +00:00
Pavel Grafov
fd1b9aa4cd Merge "Make getKeyStoreForUid convert uid to namespace." 2021-02-09 20:48:04 +00:00
Cody Kesting
fecc2a3361 Fix PolicyListener testing surface.
This CL updates VcnManager to provide a test-only method for getting
currently registered VcnUnderlyingNetworkPolicyListeners. This is
preferrable over the current method, which accesses VcnManager's private
Map directly.

Bug: 8675309
Test: atest FrameworksVcnTests
Change-Id: I7afd60ff55868ae44bfa74910ae02daf8a81b107
2021-02-09 11:44:41 -08:00
Treehugger Robot
8ae2344540 Merge "Update idmap2_tests to really work host-side" 2021-02-09 19:17:27 +00:00
Lorenzo Colitti
9cc08edf1f Stop using mVpns in getConnectionOwnerUid.
Use data that is already available in ConnectivityService
instead.

The behaviour of the new implementation is slightly different
from Q and R code when the permission check fails.

- The old code would throw a SecurityException if an app that
  was not an active VPN called the method, and would return
  INVALID_UID if the connection belonged to a UID that was not
  subject to the VPN.
- The new code returns INVALID_UID in both cases.

This does not seem like a compatibility problem. The only case in
which the code throws SecurityException is if the app is not a
current VPN app, but the app already knows whether it is or not.
The docs don't mention that the method SecurityException, either.

Bug: 173331190
Test: atest FrameworksNetTests
Test: atest HostsideVpnTests
Change-Id: If3d031e74df33b5c97e12ebf02272faac6769d50
2021-02-10 02:52:16 +09:00
Lorenzo Colitti
76e8a43e68 Add a VpnTransportInfo object.
This currently stores the VPN type and a session name, but can be
extended in the future.

Bug: 173331190
Test: added coverage in VpnTest
Test: added coverage in ConnectivityServiceTest
Test: added coverage in NetworkAgentTest
Change-Id: I450858a9fa332c8d896dbdb4c14337d5ec23677f
2021-02-10 02:52:16 +09:00
Daniel Bright
9a3cfbbb73 Merge "Hide NO_THROTTLE_EXPIRY_TIME" am: 14d9b03781
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581423

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1278bdf9dd8890f6fe76dfd8b3a01b273a22986
2021-02-09 17:37:41 +00:00
Kohsuke Yatoh
4cccafc4ca Merge "Add tests/ApkVerityTest/OWNERS." am: 3deb25243e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1576392

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f60bfcd95bf26920a93c8a589cf7a03881ce08d
2021-02-09 17:24:27 +00:00
Daniel Bright
14d9b03781 Merge "Hide NO_THROTTLE_EXPIRY_TIME" 2021-02-09 17:17:55 +00:00
Janis Danisevskis
62457226c9 Merge "Keystore 2.0 SPI: Fix various CTS failures." am: b660e617df
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580243

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib01d678ed93829e65cb685076d177327ecb1baad
2021-02-09 17:13:00 +00:00
Julien Desprez
91e0330153 Update idmap2_tests to really work host-side
idmap2_tests is marked host_supported:true but use
a AndroidTest.xml config that can only work for device.

Deleting the explict config to rely on the auto-gen ones.
Adding unit_tests:true to run in presubmit

Test: presubmit, atest idmap2_tests --host
Bug: 179092189
Change-Id: I0b325abc6ce7fc6c777d070bb0fc0e9e8a7cdedd
2021-02-09 17:11:34 +00:00
Elliott Hughes
9990c39494 Merge "Stop manually mixing /dev/hw_random." am: 220091e16f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578823

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb6be962882252471c4ce94f7ba3950d6aae5d8c
2021-02-09 17:03:43 +00:00
Kohsuke Yatoh
3deb25243e Merge "Add tests/ApkVerityTest/OWNERS." 2021-02-09 16:52:24 +00:00