Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c760aaf2 authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I4584109bb6a93937c4d79c0d09a1935e5939200d
parents 0aa47a13 ad7b18e0

services/core/java/com/android/server/wm/ActivityStartController.java

+11 −7
Original line number Original line Diff line number Diff line
@@ -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(