PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: c3ab03e

* commit 'c3ab03ecdb505114770cbb87b61457fabf75847f':
  Guard against app info crash

Change-Id: I313465d83efc950527b1634e2bc6609e6ea8e7cf
This commit is contained in:
Jason Monk
2016-04-19 13:45:18 +00:00
committed by android-build-merger
parent 9c8d099f44 c3ab03ecdb
commit 9f6fcdf0d7
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -52,7 +52,6 @@ import android.os.ServiceManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.provider.Settings; import android.provider.Settings;
import android.service.notification.NotificationListenerService;
import android.service.notification.NotificationListenerService.Ranking; import android.service.notification.NotificationListenerService.Ranking;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener; import android.support.v7.preference.Preference.OnPreferenceClickListener;
@@ -936,7 +935,7 @@ public class InstalledAppDetails extends AppInfoBase
} }
private boolean hasPermission(String permission) { private boolean hasPermission(String permission) {
if (mPackageInfo.requestedPermissions == null) { if (mPackageInfo == null || mPackageInfo.requestedPermissions == null) {
return false; return false;
} }
for (int i = 0; i < mPackageInfo.requestedPermissions.length; i++) { for (int i = 0; i < mPackageInfo.requestedPermissions.length; i++) {