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

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

Change-Id: Id18e27ffc3db2e885c25a87f770437302f8dcd5d
This commit is contained in:
Riddle Hsu
2021-06-30 05:41:29 +00:00
committed by Automerger Merge Worker
parent 4ac7a783f0 397f6cdc5e
commit 7866acdd0a
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, final ActivityInfo ainfo = AppGlobals.getPackageManager().getActivityInfo(comp,
STOCK_PM_FLAGS, UserHandle.getUserId(callingUid)); STOCK_PM_FLAGS, UserHandle.getUserId(callingUid));
if (ainfo.applicationInfo.uid != callingUid) { if (ainfo == null || ainfo.applicationInfo.uid != callingUid) {
throw new SecurityException( Slog.e(TAG, "Can't add task for another application: target uid="
"Can't add task for another application: target uid=" + (ainfo == null ? Process.INVALID_UID : ainfo.applicationInfo.uid)
+ ainfo.applicationInfo.uid + ", calling uid=" + callingUid); + ", calling uid=" + callingUid);
return INVALID_TASK_ID;
} }
final Task rootTask = r.getRootTask(); final Task rootTask = r.getRootTask();