commit | c4580ea568195d1844f38acd811df1182c1aada2 | [log] [tgz] |
---|---|---|
author | Jonathan Scott <scottjonathan@google.com> | Thu Oct 21 16:49:30 2021 +0100 |
committer | Jonathan Scott <scottjonathan@google.com> | Thu Oct 21 16:56:43 2021 +0100 |
tree | 45fc7b0d652835329c39fdc66d6634518691d974 | |
parent | 24278a9a5563b694edeaf2714c0cb309048994dc [diff] |
Null check when no permissions are requested. Test: atest com.google.android.gts.devicepolicy.ManagedProfileTest#testManagedProfileSetup Fixes: 203750105 Change-Id: Ica76379754511e8455aeb009d7243075a34bd89a
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/packages/Package.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/packages/Package.java index 9135516..9483480 100644 --- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/packages/Package.java +++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/packages/Package.java
@@ -516,6 +516,10 @@ throw new NeneException("Error getting requestedPermissions, does not exist"); } + if (packageInfo.requestedPermissions == null) { + return new HashSet<>(); + } + return new HashSet<>(Arrays.asList(packageInfo.requestedPermissions)); }