commit 7f35fa7365b24f13f7553c452dc68f99fc7304ae
author Shreyas Basarge <snb@google.com> Sat Feb 20 02:14:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Feb 20 02:14:27 2016 +0000
tree 16eace3fc7a76b749ff7c9df5869bc42cbabcf56
parent 6aff10d0662bc4c7e64a2e6d22f3606ef4dd1046
parent 20c518816a0946dff67a3b99b929bc30c9b0ad6c

NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 am: 6fc321a66d am: 5e4e02b009 am: 242bdb6d5b am: 4aa78554df am: 20339172bd
am: 20c518816a

* commit '20c518816a0946dff67a3b99b929bc30c9b0ad6c':
  NPE fix for SyncStorageEngine read authority

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 0b0e3d4..96a7bb4 100644
--- a/services/core/java/com/android/server/content/SyncStorageEngine.java
+++ b/services/core/java/com/android/server/content/SyncStorageEngine.java
@@ -45,6 +45,7 @@
 import android.util.SparseArray;
 import android.util.ArrayMap;
 import android.util.Xml;
+import android.util.EventLog;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.ArrayUtils;
@@ -1900,8 +1901,13 @@
                             if ("authority".equals(tagName)) {
                                 authority = parseAuthority(parser, version);
                                 periodicSync = null;
-                                if (authority.ident > highestAuthorityId) {
-                                    highestAuthorityId = authority.ident;
+                                if (authority != null) {
+                                    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);