commit c21afc29c3a0ea6fe95c24a390f352bbe6bf6b30
author Jeongik Cha <jeongik@google.com> Fri Apr 12 15:53:53 2024 +0900
committer Jeongik Cha <jeongik@google.com> Mon Apr 15 19:45:13 2024 +0900
tree a2dab117f7cb5e2620313d664ef89416c3f5fb10
parent 52bd4f135acdb36fbc7f3a4402bb29416e3ba06c

Add metaData null check in isRequiredAppDeclaredInMetadata

It could be null if there is no metadata in AndroidManifest.xml

Bug: 333859398
Test: CtsAdminPackageInstallerTestCases
Change-Id: Ic3f6a17fab917d10bce57b59b709a1d388959148

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