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

Fixing test that is breaking in some environments.

Browse Source 
Test: atest com.android.server.pm.CrossProfileAppsServiceImplTest#startActivityAsUser_sameTask_fromProfile_success
Bug: 252837119

Cherry picked from: Ie0ca41247b80f927ef1377866d1a2d2d2deb5333

Change-Id: Ibd312b482ffe2df04eb1e33303800e2377fe203f
This commit is contained in:
Gareth Vaughan
2022-11-21 13:13:17 -05:00
parent ed8cd54d93
commit 735a3d612d
1 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
services/tests/servicestests/src/com/android/server/pm/CrossProfileAppsServiceImplTest.java
View File

@@ -38,6 +38,7 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManagerInternal;
import android.content.pm.PermissionInfo;
import android.content.pm.ResolveInfo;
import android.os.Binder;
import android.os.Bundle;
import android.os.IBinder;
import android.os.UserHandle;
@@ -47,7 +48,6 @@ import android.permission.PermissionManager;
import android.platform.test.annotations.Presubmit;
import android.util.SparseArray;
import com.android.activitycontext.ActivityContext;
import com.android.internal.util.FunctionalUtils.ThrowingRunnable;
import com.android.internal.util.FunctionalUtils.ThrowingSupplier;
import com.android.server.LocalServices;
@@ -611,34 +611,23 @@ public class CrossProfileAppsServiceImplTest {
mTestInjector.setCallingUserId(PROFILE_OF_PRIMARY_USER);
Bundle options = ActivityOptions.makeOpenCrossProfileAppsAnimation().toBundle();
IBinder result = ActivityContext.getWithContext(activity -> {
try {
IBinder targetTask = activity.getActivityToken();
mCrossProfileAppsServiceImpl.startActivityAsUser(
mIApplicationThread,
PACKAGE_ONE,
FEATURE_ID,
ACTIVITY_COMPONENT,
UserHandle.of(PRIMARY_USER).getIdentifier(),
true,
targetTask,
options);
return targetTask;
} catch (Exception re) {
return null;
}
});
if (result == null) {
throw new Exception();
}
Binder targetTask = new Binder();
mCrossProfileAppsServiceImpl.startActivityAsUser(
mIApplicationThread,
PACKAGE_ONE,
FEATURE_ID,
ACTIVITY_COMPONENT,
UserHandle.of(PRIMARY_USER).getIdentifier(),
true,
targetTask,
options);
verify(mActivityTaskManagerInternal)
.startActivityAsUser(
nullable(IApplicationThread.class),
eq(PACKAGE_ONE),
eq(FEATURE_ID),
any(Intent.class),
eq(result),
eq(targetTask),
anyInt(),
eq(options),
eq(PRIMARY_USER));