Merge "Add missing null check to AppErrors#handleAppCrashLocked" into nyc-mr1-dev

2016-08-09 21:48:06 +00:00
parent 529319d81d b2b3b64417
commit 002dd29764
1 changed files with 2 additions and 1 deletions
--- 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;
            }
        }