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

Merge "Add wtf log when starting activities with different uids"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-16 05:04:16 +00:00
committed by Android (Google) Code Review
parent 622b228f79 cf2ef0c0f9
commit aa6de85d0f
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/wm/ActivityStartController.java
View File

@@ -43,6 +43,7 @@ import android.os.Message;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.Slog;
import android.util.SparseArray;
import android.util.proto.ProtoOutputStream;
import android.view.RemoteAnimationAdapter;
@@ -385,6 +386,7 @@ public class ActivityStartController {
} else {
callingPid = callingUid = -1;
}
final SparseArray<String> startingUidPkgs = new SparseArray<>();
final long origId = Binder.clearCallingIdentity();
try {
intents = ArrayUtils.filterNotNull(intents, Intent[]::new);
@@ -411,9 +413,14 @@ public class ActivityStartController {
callingUid, realCallingUid, UserHandle.USER_NULL));
aInfo = mService.mAmInternal.getActivityInfoForUser(aInfo, userId);
if (aInfo != null && (aInfo.applicationInfo.privateFlags
& ApplicationInfo.PRIVATE_FLAG_CANT_SAVE_STATE) != 0) {
throw new IllegalArgumentException("FLAG_CANT_SAVE_STATE not supported here");
if (aInfo != null) {
if ((aInfo.applicationInfo.privateFlags
& ApplicationInfo.PRIVATE_FLAG_CANT_SAVE_STATE) != 0) {
throw new IllegalArgumentException(
"FLAG_CANT_SAVE_STATE not supported here");
}
startingUidPkgs.put(aInfo.applicationInfo.uid,
aInfo.applicationInfo.packageName);
}
final boolean top = i == intents.length - 1;
@@ -439,6 +446,16 @@ public class ActivityStartController {
.setOriginatingPendingIntent(originatingPendingIntent)
.setAllowBackgroundActivityStart(allowBackgroundActivityStart);
}
// Log if the activities to be started have different uids.
if (startingUidPkgs.size() > 1) {
final StringBuilder sb = new StringBuilder("startActivities: different apps [");
final int size = startingUidPkgs.size();
for (int i = 0; i < size; i++) {
sb.append(startingUidPkgs.valueAt(i)).append(i == size - 1 ? "]" : ", ");
}
sb.append(" from ").append(callingPackage);
Slog.wtf(TAG, sb.toString());
}
final ActivityRecord[] outActivity = new ActivityRecord[1];
// Lock the loop to ensure the activities launched in a sequence.