diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-12-02 17:06:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-12-02 17:06:49 +0000 |
| commit | eb779b64aa5ef0a1ddf8bf08158de466ed8a389a (patch) | |
| tree | a34cd5e0b98fdd8ee4e9161081add29f8e6f1e61 | |
| parent | 318fec824736cd8a2e5a5cb3f76d989b0cef71df (diff) | |
| parent | f7c585a278d3ab8d5e2bf828fcf81da7f3e8974e (diff) | |
| download | cts-eb779b64aa5ef0a1ddf8bf08158de466ed8a389a.tar.gz | |
Merge changes from topic "presubmit-am-d4380b5ff6304f3daa2547a96a50170a" into sc-qpr1-dev am: f7c585a278
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/19438808
Change-Id: Ie38673a0e21c6389a3234763b63475a6c65282d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/tests/security/src/android/security/cts/SplitPermissionAutoGrantTest.kt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/tests/security/src/android/security/cts/SplitPermissionAutoGrantTest.kt b/tests/tests/security/src/android/security/cts/SplitPermissionAutoGrantTest.kt index 28d004f53cd..3b20d458354 100644 --- a/tests/tests/security/src/android/security/cts/SplitPermissionAutoGrantTest.kt +++ b/tests/tests/security/src/android/security/cts/SplitPermissionAutoGrantTest.kt @@ -18,7 +18,10 @@ package android.security.cts import android.platform.test.annotations.AsbSecurityTest import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.compatibility.common.util.mainline.MainlineModule +import com.android.compatibility.common.util.mainline.ModuleDetector import org.junit.After +import org.junit.Assume.assumeFalse import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -35,6 +38,8 @@ class SplitPermissionAutoGrantTest : BasePermissionUiTest() { @Test @AsbSecurityTest(cveBugId = [223907044]) fun testAutoGrant() { + assumeFalse(ModuleDetector.moduleIsPlayManaged( + mContext.getPackageManager(), MainlineModule.PERMISSION_CONTROLLER)) installPackage(SPLIT_PERMISSION_APK_PATH) assertAppHasPermission(android.Manifest.permission.BLUETOOTH, true) assertAppHasPermission(android.Manifest.permission.BLUETOOTH_CONNECT, true) |