commit 7503d06e5e31850fd13f85212543e7bd321853fc
author Shreyas Basarge <snb@google.com> Fri Feb 19 23:31:21 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 19 23:31:24 2016 +0000
tree 43eff10ed69dbe2c1b85f8a97f6df146579584b8
parent 359df40aaf4be97e94e78465fa06a6b6a018466b
parent bae9ded302fab89ce22c5bd20ab914448bdb5f18

Merge "NPE Fix in SyncStorageEngine" into nyc-dev

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 cefaa8d..05aabf1 100644
--- a/services/core/java/com/android/server/content/SyncStorageEngine.java
+++ b/services/core/java/com/android/server/content/SyncStorageEngine.java
@@ -1500,6 +1500,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);