commit df43efaaa2c848bb575eb411c97bf1d7caa55cca
author Tom Bell <bellthomas@google.com> Mon Jun 14 13:54:42 2021 +0000
committer Tom Bell <bellthomas@google.com> Mon Jul 05 09:57:36 2021 +0000
tree e65978c11054f7ff109970825a75a1eba49dcb9a
parent 2a129ff7271c77dfeb5aa13b59e9f4a5ecc61738

Fix issue where output format could break

Signed-off-by: Tom Bell <bellthomas@google.com>
Bug: 190119782
Test: manual - compilation and run on device
Change-Id: I1e62cc390ce2826cfdff91fe317e31fd55729dfa

common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/PackageDeviceInfo.java

diff --git a/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/PackageDeviceInfo.java b/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/PackageDeviceInfo.java
index 735b805..4ed65de 100644
--- a/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/PackageDeviceInfo.java
+++ b/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/PackageDeviceInfo.java
@@ -139,6 +139,8 @@
         store.startArray(REQUESTED_PERMISSIONS);
         if (pkg.requestedPermissions != null && pkg.requestedPermissions.length > 0) {
             for (String permission : pkg.requestedPermissions) {
+                if (permission == null) continue;
+
                 try {
                     final PermissionInfo pi = pm.getPermissionInfo(permission, 0);
 
@@ -146,8 +148,6 @@
                     store.addResult(PERMISSION_NAME, permission);
                     writePermissionsDetails(pi, store);
 
-                    if (permission == null) continue;
-
                     final boolean isPlatformPermission = systemPermissions.contains(permission);
                     if (isPlatformPermission) {
                       final boolean isAndroidPermission = permission.startsWith(PLATFORM_PERMISSION_PREFIX);