commit 23311d456a77417fa9607029b369f6ce73a376b4
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Apr 15 12:06:31 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 15 12:06:31 2024 +0000
tree 71db598c4c21615b597d6188c364296b5cf2303d
parent 0affadc4ca82a569a91c686b1ad38ea8c24a0e5c
parent c21afc29c3a0ea6fe95c24a390f352bbe6bf6b30

Merge "Add metaData null check in isRequiredAppDeclaredInMetadata" into main

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