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

Merge "Prevent app check via content provider." into sc-dev

Browse Source
This commit is contained in:
Jeff Chang
2021-06-29 15:01:37 +00:00
committed by Android (Google) Code Review
parent 25cc20479c 18240c606c
commit ad7b18e06d
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
package com.android.server.wm; package com.android.server.wm;
import static android.app.ActivityManager.START_CANCELED;
import static android.app.ActivityManager.START_SUCCESS; import static android.app.ActivityManager.START_SUCCESS;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
@@ -390,15 +391,18 @@ public class ActivityStartController {
0 /* startFlags */, null /* profilerInfo */, userId, filterCallingUid); 0 /* startFlags */, null /* profilerInfo */, userId, filterCallingUid);
aInfo = mService.mAmInternal.getActivityInfoForUser(aInfo, userId); aInfo = mService.mAmInternal.getActivityInfoForUser(aInfo, userId);
// Carefully collect grants without holding lock
if (aInfo != null) { if (aInfo != null) {
try {
// Carefully collect grants without holding lock
intentGrants = mSupervisor.mService.mUgmInternal intentGrants = mSupervisor.mService.mUgmInternal
.checkGrantUriPermissionFromIntent(intent, filterCallingUid, .checkGrantUriPermissionFromIntent(intent, filterCallingUid,
aInfo.applicationInfo.packageName, aInfo.applicationInfo.packageName,
UserHandle.getUserId(aInfo.applicationInfo.uid)); UserHandle.getUserId(aInfo.applicationInfo.uid));
} catch (SecurityException e) {
Slog.d(TAG, "Not allowed to start activity since no uri permission.");
return START_CANCELED;
} }
if (aInfo != null) {
if ((aInfo.applicationInfo.privateFlags if ((aInfo.applicationInfo.privateFlags
& ApplicationInfo.PRIVATE_FLAG_CANT_SAVE_STATE) != 0) { & ApplicationInfo.PRIVATE_FLAG_CANT_SAVE_STATE) != 0) {
throw new IllegalArgumentException( throw new IllegalArgumentException(