Merge "Guard against app info crash" into nyc-dev am: c3ab03e am: 8379c3f

am: fec910e

* commit 'fec910e998654eb523f9b61dbc0f14d1361b55a7':
  Guard against app info crash

Change-Id: I215b7d4928f3a0ba9c4f3d9ae08f367cba6a1ad2
This commit is contained in:
Jason Monk
2016-04-19 13:57:28 +00:00
committed by android-build-merger

View File

@@ -52,7 +52,6 @@ import android.os.ServiceManager;
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 @@ public class InstalledAppDetails extends AppInfoBase
}
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++) {