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

Merge "Return invalid task id if no acceptable target app" into sc-dev am: 397f6cdc5e am: 7866acdd0a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15126535

Change-Id: Ic7f87cf3dfd93cb96b0d6947fe3dfa1f8ccf63f5
This commit is contained in:
Riddle Hsu
2021-06-30 05:57:59 +00:00
committed by Automerger Merge Worker
parent 79e422da66 7866acdd0a
commit ca2b42b2a6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -2633,10 +2633,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
}
final ActivityInfo ainfo = AppGlobals.getPackageManager().getActivityInfo(comp,
STOCK_PM_FLAGS, UserHandle.getUserId(callingUid));
if (ainfo.applicationInfo.uid != callingUid) {
throw new SecurityException(
"Can't add task for another application: target uid="
+ ainfo.applicationInfo.uid + ", calling uid=" + callingUid);
if (ainfo == null || ainfo.applicationInfo.uid != callingUid) {
Slog.e(TAG, "Can't add task for another application: target uid="
+ (ainfo == null ? Process.INVALID_UID : ainfo.applicationInfo.uid)
+ ", calling uid=" + callingUid);
return INVALID_TASK_ID;
}
final Task rootTask = r.getRootTask();