am a9af1d26: am 3fc7bfd9: Merge "Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException" into mnc-dev

* commit 'a9af1d262cbf5c26a57b4028d57b4053c29fdce6':
  Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
This commit is contained in:
Fabrice Di Meglio
2015-05-14 22:01:52 +00:00
committed by Android Git Automerger

View File

@@ -284,12 +284,15 @@ public class InstalledAppDetails extends AppInfoBase
mBatteryPreference.setOnPreferenceClickListener(this);
mLaunchPreference = findPreference(KEY_LAUNCH);
if ((mAppEntry.info.flags&ApplicationInfo.FLAG_INSTALLED) == 0) {
mLaunchPreference.setEnabled(false);
} else if (!mAppEntry.info.enabled) {
mLaunchPreference.setEnabled(false);
if (mAppEntry.info != null) {
if ((mAppEntry.info.flags&ApplicationInfo.FLAG_INSTALLED) == 0 ||
!mAppEntry.info.enabled) {
mLaunchPreference.setEnabled(false);
} else {
mLaunchPreference.setOnPreferenceClickListener(this);
}
} else {
mLaunchPreference.setOnPreferenceClickListener(this);
mLaunchPreference.setEnabled(false);
}
}