commit 44115cf7c3ac6a4cb8a6658b4d07055ffe16f9e1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Apr 15 12:27:56 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 15 12:27:56 2024 +0000
tree 71db598c4c21615b597d6188c364296b5cf2303d
parent a185585973b7ca7be0867b129e051f71367a5f16
parent 23311d456a77417fa9607029b369f6ce73a376b4

Merge "Add metaData null check in isRequiredAppDeclaredInMetadata" into main am: 23311d456a

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

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

services/devicepolicy/java/com/android/server/devicepolicy/OverlayPackagesProvider.java

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/OverlayPackagesProvider.java b/services/devicepolicy/java/com/android/server/devicepolicy/OverlayPackagesProvider.java
index f3b164c..f4c4405 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/OverlayPackagesProvider.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/OverlayPackagesProvider.java
@@ -203,6 +203,9 @@
         } catch (PackageManager.NameNotFoundException e) {
             return false;
         }
+        if (packageInfo.applicationInfo == null || packageInfo.applicationInfo.metaData == null) {
+            return false;
+        }
         final String metadataKey = sActionToMetadataKeyMap.get(provisioningAction);
         return packageInfo.applicationInfo.metaData.getBoolean(metadataKey);
     }