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

Merge "Fixing test that is breaking in some environments. Test: atest com.android.server.pm.CrossProfileAppsServiceImplTest#startActivityAsUser_sameTask_fromProfile_success Bug: 252837119"

Browse Source
This commit is contained in:
Gareth Vaughan
2022-12-07 22:00:26 +00:00
committed by Gerrit Code Review
parent 936f661025 f261a3e85e
commit cd2a855610
1 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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