| commit | df3ce9de47b0217311d0ae417c9d777633416b73 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Apr 15 13:00:41 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 15 13:00:41 2024 +0000 |
| tree | f519f20d8ebf0c6a7282ec88d2152e7b119f2f35 | |
| parent | 6e44c398a3c4b84cc582f910fe85dab49a96daf1 [diff] | |
| parent | 44115cf7c3ac6a4cb8a6658b4d07055ffe16f9e1 [diff] |
Merge "Add metaData null check in isRequiredAppDeclaredInMetadata" into main am: 23311d456a am: 44115cf7c3 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3040373 Change-Id: Iab48f70c9927c9c779d261262ef6edb4aada0c1a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/OverlayPackagesProvider.java b/services/devicepolicy/java/com/android/server/devicepolicy/OverlayPackagesProvider.java index 94c1374..d1830126 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/OverlayPackagesProvider.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/OverlayPackagesProvider.java
@@ -215,6 +215,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); }