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

Merge "Handle callingPackageName being null properly in checkStartActivity()." into qt-dev

Browse Source 
am: 93deb904d3

Change-Id: I24a84d82818feeecb4c877871514fc20ef155e8e
This commit is contained in:
Hai Zhang
2019-05-22 13:18:59 -07:00
committed by android-build-merger
parent 0ac85feb6f 93deb904d3
commit 9679814d35
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/policy/PermissionPolicyInternal.java
View File

@@ -17,6 +17,7 @@
package com.android.server.policy; package com.android.server.policy;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.Intent; import android.content.Intent;
/** /**
@@ -34,5 +35,5 @@ public abstract class PermissionPolicyInternal {
* @return whether the activity should be started * @return whether the activity should be started
*/ */
public abstract boolean checkStartActivity(@NonNull Intent intent, int callingUid, public abstract boolean checkStartActivity(@NonNull Intent intent, int callingUid,
@NonNull String callingPackage); @Nullable String callingPackage);
} }

5
services/core/java/com/android/server/policy/PermissionPolicyService.java
View File

@@ -480,8 +480,9 @@ public final class PermissionPolicyService extends SystemService {
@Override @Override
public boolean checkStartActivity(@NonNull Intent intent, int callingUid, public boolean checkStartActivity(@NonNull Intent intent, int callingUid,
@NonNull String callingPackage) { @Nullable String callingPackage) {
if (isActionRemovedForCallingPackage(intent.getAction(), callingPackage)) { if (callingPackage != null && isActionRemovedForCallingPackage(intent.getAction(),
callingPackage)) {
Slog.w(LOG_TAG, "Action Removed: starting " + intent.toString() + " from " Slog.w(LOG_TAG, "Action Removed: starting " + intent.toString() + " from "
+ callingPackage + " (uid=" + callingUid + ")"); + callingPackage + " (uid=" + callingUid + ")");
return false; return false;