Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes ManagedUserContentResolverTest for automotive." into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-01-27 16:05:36 +00:00
committed by Android (Google) Code Review
parent 0b193b27b4 3996432d71
commit 05f2b29c95
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/tests/coretests/src/android/content/AbstractCrossUserContentResolverTest.java
View File

@@ -17,6 +17,7 @@
package android.content; package android.content;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.activity.LocalProvider; import android.app.activity.LocalProvider;
@@ -58,10 +59,12 @@ abstract class AbstractCrossUserContentResolverTest {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
mContext = InstrumentationRegistry.getContext(); 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); mUm = UserManager.get(mContext);
final UserInfo userInfo = createUser(); final UserInfo userInfo = createUser();
mCrossUserId = userInfo.id; mCrossUserId = userInfo.id;
final PackageManager pm = mContext.getPackageManager();
pm.installExistingPackageAsUser(mContext.getPackageName(), mCrossUserId); pm.installExistingPackageAsUser(mContext.getPackageName(), mCrossUserId);
unlockUser(); unlockUser();