summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2015-07-28 20:32:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-28 20:32:08 +0000
commit5b5ed310d4eaf5f1c74594ada81a148d4f67f4c0 (patch)
tree0a2e4601855e11dc353296cc69d2da3e8c8377e3 /src/com
parentfeeae4cdebfa1303581dbd284039bcf91068addd (diff)
parented91bbdb1f2087a9ffcfebc6c0425d1f45976e22 (diff)
downloadpackages_apps_Settings-5b5ed310d4eaf5f1c74594ada81a148d4f67f4c0.zip
packages_apps_Settings-5b5ed310d4eaf5f1c74594ada81a148d4f67f4c0.tar.gz
packages_apps_Settings-5b5ed310d4eaf5f1c74594ada81a148d4f67f4c0.tar.bz2
Merge "Prevent crash in app memory updater." into mnc-dev
Diffstat (limited to 'src/com')
-rwxr-xr-xsrc/com/android/settings/applications/InstalledAppDetails.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 27b6c80..3a0eee6 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -836,6 +836,9 @@ public class InstalledAppDetails extends AppInfoBase
@Override
protected ProcStatsPackageEntry doInBackground(Void... params) {
+ if (getActivity() == null) {
+ return null;
+ }
if (mPackageInfo == null) {
return null;
}