From dc74142c74bf37e0ddcbe6ec7d76f57191815b44 Mon Sep 17 00:00:00 2001
From: Erik Wolsheimer <ewol@google.com>
Date: Fri, 5 Aug 2016 09:24:07 -0700
Subject: [PATCH] Add missing null check to AppErrors#handleAppCrashLocked

BUG: 30692618
Change-Id: Ibe3589e1248520067714d5a20963a17935789066
---
 services/core/java/com/android/server/am/AppErrors.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java
index 1f156dfd19851..7eff773543c8f 100644
--- a/services/core/java/com/android/server/am/AppErrors.java
+++ b/services/core/java/com/android/server/am/AppErrors.java
@@ -638,7 +638,8 @@ class AppErrors {
 
             // Allow restarting for started or bound foreground services that are crashing the
             // first time. This includes wallpapers.
-            if (sr.crashCount <= 1 && (sr.isForeground || procIsBoundForeground)) {
+            if ((data != null) && (sr.crashCount <= 1)
+                    && (sr.isForeground || procIsBoundForeground)) {
                 data.isRestartableForService = true;
             }
         }