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

Merge "Fix NPE in PermsissionChecker" into sc-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2021-03-31 06:33:15 +00:00
committed by Android (Google) Code Review
parent 264c501800 623ff43bda
commit de698775ad
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/content/PermissionChecker.java
View File

@@ -16,6 +16,7 @@
package android.content; package android.content;
import android.Manifest;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
@@ -845,7 +846,7 @@ public final class PermissionChecker {
boolean forDataDelivery, boolean fromDatasource) { boolean forDataDelivery, boolean fromDatasource) {
final int op = AppOpsManager.permissionToOpCode(permission); final int op = AppOpsManager.permissionToOpCode(permission);
if (op < 0) { if (op < 0) {
Slog.wtf(LOG_TAG, "Appop permission " + permission + "with no app op defined:!"); Slog.wtf(LOG_TAG, "Appop permission " + permission + " with no app op defined!");
return PERMISSION_HARD_DENIED; return PERMISSION_HARD_DENIED;
} }
@@ -933,7 +934,15 @@ public final class PermissionChecker {
} }
if (op < 0) { if (op < 0) {
Slog.wtf(LOG_TAG, "Runtime permission " + permission + "with no app op defined:!"); // Bg location is one-off runtime modifier permission and has no app op
if (sPlatformPermissions.contains(permission)
&& !Manifest.permission.ACCESS_BACKGROUND_LOCATION.equals(permission)) {
Slog.wtf(LOG_TAG, "Platform runtime permission " + permission
+ " with no app op defined!");
}
if (next == null) {
return PERMISSION_GRANTED;
}
current = next; current = next;
continue; continue;
} }