commit 58048c1f17d54166c6a048af2365d17dd32f4d57
author Shreyas Basarge <snb@google.com> Sat Feb 20 00:47:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Feb 20 00:47:41 2016 +0000
tree c63c2a4882f7105dfb70cc9347ed8b6bf9691087
parent 5fc753acaf9731742957db256b2818376fe8c4a4
parent 339c4f2b055d40acea280a2d4b6c83c17f86a8b5

NPE fix for SyncStorageEngine read authority am: a962d9eba7
am: 339c4f2b05

* commit '339c4f2b055d40acea280a2d4b6c83c17f86a8b5':
  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 9f15836..e3a3588 100644
--- a/services/core/java/com/android/server/content/SyncStorageEngine.java
+++ b/services/core/java/com/android/server/content/SyncStorageEngine.java
@@ -41,6 +41,7 @@
 import android.util.Pair;
 import android.util.SparseArray;
 import android.util.Xml;
+import android.util.EventLog;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.ArrayUtils;
@@ -1752,8 +1753,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);