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

Commit 639360aa authored by Hai Zhang's avatar Hai Zhang
Browse files

Handle callingPackageName being null properly in checkStartActivity(). 

callingPackageName can actually be null when started via command line,
etc. Previously the getApplicationInfo() call will fail if package
name is null and we'll ignore it so there won't be a crash, but it's
still better to handle it properly.

Bug: 131204827
Test: presubmit
Change-Id: I33ba43c28798226bed925940c2ffd09622372d09
parent 738c9823

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;