From 46c06fb12434c58c5a4c65f78cd2caf0fa15523f Mon Sep 17 00:00:00 2001
From: Manjeet Rulhania <mrulhania@google.com>
Date: Wed, 16 Nov 2022 00:23:55 +0000
Subject: [PATCH] Adding null check

Bug: 259203810
Test: manual
Change-Id: I4db535957e4176d982c3996bb2970ce41fd77591
---
 core/java/android/app/AppOpsManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index 0f4644c63b8d3..10e1f78b88ac8 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -2582,8 +2582,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;