From 98bfb3466c4bd433a35e5da55ba6cd5eb652d050 Mon Sep 17 00:00:00 2001 From: riddle_hsu Date: Thu, 30 Jul 2015 21:52:58 +0800 Subject: [PATCH] Fix NPE in JobStore when jobs.xml is empty. It is possible that jobs.xml does not have valid content if the device meet unexpected power off or reboot during writing the file, then parser.getName() may get null string on next boot. Because log does not allow to print null message. It will result boot fail: Caused by: java.lang.NullPointerException: println needs a message at android.util.Log.println_native(Native Method) at android.util.Slog.d at com.android.server.job.JobStore $ReadJobMapFromDiskRunnable.readJobMapImpl Change-Id: Icd485096e2f00f4028428a9ad95cd0ef66b2dca0 --- services/core/java/com/android/server/job/JobStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/job/JobStore.java b/services/core/java/com/android/server/job/JobStore.java index 24d4f15208d2c..11e7605ed62c4 100644 --- a/services/core/java/com/android/server/job/JobStore.java +++ b/services/core/java/com/android/server/job/JobStore.java @@ -457,7 +457,7 @@ public class JobStore { while (eventType != XmlPullParser.START_TAG && eventType != XmlPullParser.END_DOCUMENT) { eventType = parser.next(); - Slog.d(TAG, parser.getName()); + Slog.d(TAG, "Start tag: " + parser.getName()); } if (eventType == XmlPullParser.END_DOCUMENT) { if (DEBUG) {