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

Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-11 04:49:59 +00:00
committed by Android (Google) Code Review
parent 862ceca282 da78af4d66
commit 321b255d93
4 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -7594,7 +7594,7 @@ public class ActivityManagerService extends IActivityManager.Stub
}
@GuardedBy("this")
private final boolean attachApplicationLocked(IApplicationThread thread,
private boolean attachApplicationLocked(@NonNull IApplicationThread thread,
int pid, int callingUid, long startSeq) {
// Find the application record that is being attached... either via
@@ -7975,6 +7975,9 @@ public class ActivityManagerService extends IActivityManager.Stub
@Override
public final void attachApplication(IApplicationThread thread, long startSeq) {
if (thread == null) {
throw new SecurityException("Invalid application interface");
}
synchronized (this) {
int callingPid = Binder.getCallingPid();
final int callingUid = Binder.getCallingUid();

15
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -3943,6 +3943,11 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
final boolean navigateUpToLocked(ActivityRecord srec, Intent destIntent, int resultCode,
Intent resultData) {
if (srec.app == null || srec.app.thread == null) {
// Nothing to do if the caller is not attached, because this method should be called
// from an alive activity.
return false;
}
final TaskRecord task = srec.getTask();
final ArrayList<ActivityRecord> activities = task.mActivities;
final int start = activities.indexOf(srec);
@@ -3994,14 +3999,14 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
}
if (parent != null && foundParentInTask) {
final int callingUid = srec.info.applicationInfo.uid;
final int parentLaunchMode = parent.info.launchMode;
final int destIntentFlags = destIntent.getFlags();
if (parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_INSTANCE ||
parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TASK ||
parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TOP ||
(destIntentFlags & Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) {
parent.deliverNewIntentLocked(srec.info.applicationInfo.uid, destIntent,
srec.packageName);
parent.deliverNewIntentLocked(callingUid, destIntent, srec.packageName);
} else {
try {
ActivityInfo aInfo = AppGlobals.getPackageManager().getActivityInfo(
@@ -4014,10 +4019,10 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
.setActivityInfo(aInfo)
.setResultTo(parent.appToken)
.setCallingPid(-1)
.setCallingUid(parent.launchedFromUid)
.setCallingPackage(parent.launchedFromPackage)
.setCallingUid(callingUid)
.setCallingPackage(srec.packageName)
.setRealCallingPid(-1)
.setRealCallingUid(parent.launchedFromUid)
.setRealCallingUid(callingUid)
.setComponentSpecified(true)
.execute();
foundParentInTask = res == ActivityManager.START_SUCCESS;

13
services/tests/servicestests/src/com/android/server/am/ActivityStackTests.java
View File

@@ -606,6 +606,19 @@ public class ActivityStackTests extends ActivityTestsBase {
assertTrue(listener.changed);
}
@Test
public void testNavigateUpTo() {
final ActivityRecord firstActivity = new ActivityBuilder(mService).setTask(mTask).build();
final ActivityRecord secondActivity = new ActivityBuilder(mService).setTask(mTask)
.setUid(firstActivity.getUid() + 1).build();
secondActivity.app.thread = null;
// This should do nothing from a non-attached caller (app.thread == null).
assertFalse(mStack.navigateUpToLocked(secondActivity /* source record */,
firstActivity.intent /* destIntent */, 0 /* resultCode */, null /* resultData */));
assertFalse(secondActivity.finishing);
assertFalse(firstActivity.finishing);
}
private void verifyShouldSleepActivities(boolean focusedStack,
boolean keyguardGoingAway, boolean displaySleeping, boolean expected) {
mSupervisor.mFocusedStack = focusedStack ? mStack : null;

2
services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java
View File

@@ -192,6 +192,8 @@ public class ActivityTestsBase {
aInfo.applicationInfo = new ApplicationInfo();
aInfo.applicationInfo.packageName = mComponent.getPackageName();
aInfo.applicationInfo.uid = mUid;
aInfo.packageName = mComponent.getPackageName();
aInfo.name = mComponent.getClassName();
aInfo.flags |= mActivityFlags;
final ActivityRecord activity = new ActivityRecord(mService, null /* caller */,