commit bae9ded302fab89ce22c5bd20ab914448bdb5f18
author Shreyas Basarge <snb@google.com> Wed Feb 17 13:54:44 2016 +0000
committer Shreyas Basarge <snb@google.com> Wed Feb 17 13:54:44 2016 +0000
tree 5eabbb2f311536c851303b77d7df497f8c789e93
parent 46d537716e00878073a740101f1e1e088f728817

NPE Fix in SyncStorageEngine

Add a null check after reading an
authority from disk.

Bug: 26513719
Change-Id: Id8a1c8313fcde42e72a5061e38716e2f1d64fd81

services/core/java/com/android/server/content/SyncStorageEngine.java

diff --git a/services/core/java/com/android/server/content/SyncStorageEngine.java b/services/core/java/com/android/server/content/SyncStorageEngine.java
index 965054f..bc3fc6a 100644
--- a/services/core/java/com/android/server/content/SyncStorageEngine.java
+++ b/services/core/java/com/android/server/content/SyncStorageEngine.java
@@ -1490,6 +1490,9 @@
                                     if (authority.ident > highestAuthorityId) {
                                         highestAuthorityId = authority.ident;
                                     }
+                                } else {
+                                    EventLog.writeEvent(0x534e4554, "26513719", -1,
+                                            "Malformed authority");
                                 }
                             } else if (XML_TAG_LISTEN_FOR_TICKLES.equals(tagName)) {
                                 parseListenForTickles(parser);