summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/applications
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2015-07-28 21:16:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-28 21:16:06 +0000
commit8bdb556174bfb8a903040a5310e3d48f2c4be5bf (patch)
treec6f9ab784aa8ca48beb0f7c2f003029a5d21c049 /src/com/android/settings/applications
parent2ade0a5e7bb52438732555f860f924c0eeacd3c2 (diff)
parent85bdb7730814c1f1d8d13dec40e203e94fa87215 (diff)
downloadpackages_apps_Settings-8bdb556174bfb8a903040a5310e3d48f2c4be5bf.zip
packages_apps_Settings-8bdb556174bfb8a903040a5310e3d48f2c4be5bf.tar.gz
packages_apps_Settings-8bdb556174bfb8a903040a5310e3d48f2c4be5bf.tar.bz2
am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
* commit '85bdb7730814c1f1d8d13dec40e203e94fa87215': Prevent crash in app memory updater.
Diffstat (limited to 'src/com/android/settings/applications')
-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 2791cfc..a6b35df 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;
}