Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing null check to AppErrors#handleAppCrashLocked

Browse Source 
BUG: 30692618
Change-Id: Ibe3589e1248520067714d5a20963a17935789066
(cherry picked from commit dc74142c74)
This commit is contained in:
Erik Wolsheimer
2016-08-05 09:24:07 -07:00
committed by Adrian Roos
parent 58635e74ed
commit b2b3b64417
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/AppErrors.java
View File

@@ -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;
}
}