commit c3ec1ab889d34f6553f3353ab5de9dade0327953
author Jason Monk <jmonk@google.com> Fri Jun 17 17:22:03 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 17 17:22:03 2016 +0000
tree 779bd536dbab0e91e1b410bf306c5abb373eeec4
parent 0c2ccba2f9c8f683536b167a47b720d52d6893d2
parent 7a19965c9f4385bce0671f034b68e3bddfa5cc39

Merge "Protect against crash in memory details" into nyc-dev

src/com/android/settings/applications/ProcessStatsDetail.java

diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java
index 252b2ef..d538e29 100644
--- a/src/com/android/settings/applications/ProcessStatsDetail.java
+++ b/src/com/android/settings/applications/ProcessStatsDetail.java
@@ -115,6 +115,10 @@
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
+        if (mApp.mUiTargetApp == null) {
+            finish();
+            return;
+        }
         AppHeader.createAppHeader(this,
                 mApp.mUiTargetApp != null ? mApp.mUiTargetApp.loadIcon(mPm) : new ColorDrawable(0),
                 mApp.mUiLabel, mApp.mPackage, mApp.mUiTargetApp.uid);