From 3996432d712cb5da77f7cf5465478941cfea2883 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Wed, 26 Jan 2022 10:34:39 -0800 Subject: [PATCH] Fixes ManagedUserContentResolverTest for automotive. It should check if the device supports the managed_users feature. Test: atest ManagedUserContentResolverTest Fixes: 215200534 Change-Id: I23f62b4a55a42458cfd59b611ffa80f2d4eee75a --- .../content/AbstractCrossUserContentResolverTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/tests/coretests/src/android/content/AbstractCrossUserContentResolverTest.java b/core/tests/coretests/src/android/content/AbstractCrossUserContentResolverTest.java index 328429c6f96e7..e690da2d0377d 100644 --- a/core/tests/coretests/src/android/content/AbstractCrossUserContentResolverTest.java +++ b/core/tests/coretests/src/android/content/AbstractCrossUserContentResolverTest.java @@ -17,6 +17,7 @@ package android.content; import static org.junit.Assert.fail; +import static org.junit.Assume.assumeTrue; import android.app.ActivityManager; import android.app.activity.LocalProvider; @@ -58,10 +59,12 @@ abstract class AbstractCrossUserContentResolverTest { @Before public void setUp() throws Exception { mContext = InstrumentationRegistry.getContext(); + final PackageManager pm = mContext.getPackageManager(); + assumeTrue("device doesn't have the " + PackageManager.FEATURE_MANAGED_USERS + " feature", + pm.hasSystemFeature(PackageManager.FEATURE_MANAGED_USERS)); mUm = UserManager.get(mContext); final UserInfo userInfo = createUser(); mCrossUserId = userInfo.id; - final PackageManager pm = mContext.getPackageManager(); pm.installExistingPackageAsUser(mContext.getPackageName(), mCrossUserId); unlockUser();