Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 002dd297 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 529319d8 b2b3b644

services/core/java/com/android/server/am/AppErrors.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

            }

        }