am 2a3aeec3: am 2ee08cd9: am 58148481: Merge "Protect against monkey crash" into mnc-dev

* commit '2a3aeec398d3d5ef900f68e2134eecb14bec0f1a': Protect against monkey crash
2015-06-04 13:33:36 +00:00
parent e7f78bd17b 2a3aeec398
commit e5791c7de0
1 changed files with 1 additions and 1 deletions
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -406,7 +406,7 @@ public class RunningProcessesView extends FrameLayout

    // utility method used to start sub activity
    private void startServiceDetailsActivity(RunningState.MergedItem mi) {
-        if (mOwner != null) {
+        if (mOwner != null && mi != null) {
            // start new fragment to display extended information
            Bundle args = new Bundle();
            if (mi.mProcess != null) {