commit c3ab03ecdb505114770cbb87b61457fabf75847f
author Jason Monk <jmonk@google.com> Tue Apr 19 13:38:38 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 19 13:38:38 2016 +0000
tree 171aae19c5d2348eeb932845f782455c7ae0be04
parent 295f1060e990299fec7e2aa375064f9f09246e8d
parent 198d9f1cba686ab8e2c84c0ef300bdc79103e8f6

Merge "Guard against app info crash" into nyc-dev

src/com/android/settings/applications/InstalledAppDetails.java

diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 3679699..14277c9 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -52,7 +52,6 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
-import android.service.notification.NotificationListenerService;
 import android.service.notification.NotificationListenerService.Ranking;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
@@ -936,7 +935,7 @@
     }
 
     private boolean hasPermission(String permission) {
-        if (mPackageInfo.requestedPermissions == null) {
+        if (mPackageInfo == null || mPackageInfo.requestedPermissions == null) {
             return false;
         }
         for (int i = 0; i < mPackageInfo.requestedPermissions.length; i++) {