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

am: c3ec1ab889 Change-Id: If36b3350e0694ffae3086be9307295c4516828dd
2016-06-17 17:52:01 +00:00
parent 2ca05240fd c3ec1ab889
commit ca26435ca0
1 changed files with 4 additions and 0 deletions
--- a/src/com/android/settings/applications/ProcessStatsDetail.java
+++ b/src/com/android/settings/applications/ProcessStatsDetail.java
@@ -115,6 +115,10 @@ public class ProcessStatsDetail extends SettingsPreferenceFragment {
    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);