commit 95e2a5f5d1bc69272c65ce8e5353b256d2de2b14
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Dec 11 18:44:16 2024 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 11 18:44:16 2024 -0800
tree af25aa3a6edba69fa493c58723db75093df1cbb8
parent 34309be52b91facbccffa78eb5890badde894067
parent f991ca6b2be054d2cad227a44f5a802141f2e661

Merge "Avoid NullPointerException if Location manager is disabled" into main am: 0956846ea2 am: f991ca6b2b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3330014

Change-Id: I81d1deb58ebfaf8bb83a0ec7551664ef96e0d1d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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);