diff options
| author | 2022-01-27 16:42:21 +0000 | |
|---|---|---|
| committer | 2022-01-27 16:42:21 +0000 | |
| commit | e94e72927b68ef37dfabf4501745ee86d0c975a8 (patch) | |
| tree | 61a7537f689599f2e682bf15223bd7c580ea7411 | |
| parent | f71a3a938b589f8d67a1f680ee1560a999aacc79 (diff) | |
| parent | 646beccdffa24467acdb3226dc757459c8cdc12c (diff) | |
Merge "Fixes ManagedUserContentResolverTest for automotive." into sc-v2-dev am: 05f2b29c95 am: 646beccdff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16725166
Change-Id: I86fa314d8a7631a0c768f8d2ab22bb1be68714d2
| -rw-r--r-- | core/tests/coretests/src/android/content/AbstractCrossUserContentResolverTest.java | 5 | 
1 files changed, 4 insertions, 1 deletions
diff --git a/core/tests/coretests/src/android/content/AbstractCrossUserContentResolverTest.java b/core/tests/coretests/src/android/content/AbstractCrossUserContentResolverTest.java index 328429c6f96e..e690da2d0377 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();  |