Merge "Adding null check"

This commit is contained in:
Manjeet Rulhania
2022-11-17 17:51:36 +00:00
committed by Android (Google) Code Review

View File

@@ -2672,8 +2672,8 @@ public class AppOpsManager {
if (boxedOpCode != null) {
return boxedOpCode;
}
if (HealthConnectManager.isHealthPermission(ActivityThread.currentApplication(),
permission)) {
if (permission != null && HealthConnectManager.isHealthPermission(
ActivityThread.currentApplication(), permission)) {
return OP_READ_WRITE_HEALTH_DATA;
}
return OP_NONE;