commit 0956846ea2dc94a4c6ab1daae116559cfdfba02b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Dec 11 17:16:38 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 11 17:16:38 2024 -0800
tree 2b1b8288fb075c24c4b364530e00eab956b460c3
parent 4d3c3dc220260bab628b4ddcf8299e6cb91677dd
parent c25790f8f8da89d7a860e186907ce4fddad86747

Merge "Avoid NullPointerException if Location manager is disabled" into main

services/core/java/com/android/server/policy/AppOpsPolicy.java

diff --git a/services/core/java/com/android/server/policy/AppOpsPolicy.java b/services/core/java/com/android/server/policy/AppOpsPolicy.java
index ecffd38..3f9144f 100644
--- a/services/core/java/com/android/server/policy/AppOpsPolicy.java
+++ b/services/core/java/com/android/server/policy/AppOpsPolicy.java
@@ -136,7 +136,8 @@
 
         final LocationManagerInternal locationManagerInternal = LocalServices.getService(
                 LocationManagerInternal.class);
-        locationManagerInternal.setLocationPackageTagsListener(
+        if (locationManagerInternal != null) {
+            locationManagerInternal.setLocationPackageTagsListener(
                 (uid, packageTagsList) -> {
                     synchronized (mLock) {
                         if (packageTagsList.isEmpty()) {
@@ -158,6 +159,7 @@
                                 mLocationTags);
                     }
                 });
+        }
 
         final IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(Intent.ACTION_PACKAGE_ADDED);