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

Commit 38dbf9fb authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Handle callingPackageName being null properly in... 

Merge "Merge "Handle callingPackageName being null properly in checkStartActivity()." into qt-dev am: 93deb904 am: 9679814d am: bdc1aea5"
parents 6088db12 da1858e9

services/core/java/com/android/server/policy/PermissionPolicyInternal.java

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.policy;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Intent;



/**
@@ -34,5 +35,5 @@ public abstract class PermissionPolicyInternal { 
     * @return whether the activity should be started

     */

    public abstract boolean checkStartActivity(@NonNull Intent intent, int callingUid,

            @NonNull String callingPackage);

            @Nullable String callingPackage);

}

services/core/java/com/android/server/policy/PermissionPolicyService.java

+3 −2
Original line number Diff line number Diff line
@@ -480,8 +480,9 @@ public final class PermissionPolicyService extends SystemService { 


        @Override

        public boolean checkStartActivity(@NonNull Intent intent, int callingUid,

                @NonNull String callingPackage) {

            if (isActionRemovedForCallingPackage(intent.getAction(), callingPackage)) {

                @Nullable String callingPackage) {

            if (callingPackage != null && isActionRemovedForCallingPackage(intent.getAction(),

                    callingPackage)) {

                Slog.w(LOG_TAG, "Action Removed: starting " + intent.toString() + " from "

                        + callingPackage + " (uid=" + callingUid + ")");

                return false;