Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44115cf7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ief352215470f40e386a67db61d4f271a9b9fd3a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1855859 23311d45

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

+3 −0
Original line number Diff line number Diff line
@@ -203,6 +203,9 @@ public class OverlayPackagesProvider { 
        } 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);

    }