Merge "NPE Fix in SyncStorageEngine" into nyc-dev

am: 7503d06e5e * commit '7503d06e5e31850fd13f85212543e7bd321853fc': NPE Fix in SyncStorageEngine
2016-02-19 23:46:02 +00:00
parent abf9e5695d 7503d06e5e
commit 31236ac232
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/content/SyncStorageEngine.java
+++ b/services/core/java/com/android/server/content/SyncStorageEngine.java
@@ -1500,6 +1500,9 @@ public class SyncStorageEngine extends Handler {
                                    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);