diff options
author | Addison Nuding <addison@google.com> | 2016-03-01 02:06:01 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-01 02:06:04 +0000 |
commit | eb12dc14e646e90745c6d34f661523965d4428b9 (patch) | |
tree | 5148a4d24f1a0220d4701b2b944da992cd5ba044 | |
parent | b0b15d54dacb8f0966c973b8bcde13d4a30fa830 (diff) | |
parent | dba2780444da3ab43a90ad14502f1e87e4b792b8 (diff) | |
download | base-eb12dc14e646e90745c6d34f661523965d4428b9.tar.gz |
Merge "NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17" into mnc-dr-ryu-dev
-rw-r--r-- | services/core/java/com/android/server/content/SyncStorageEngine.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/content/SyncStorageEngine.java b/services/core/java/com/android/server/content/SyncStorageEngine.java index cca0c16f805f..a2f0e4ef0960 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.Pair; 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; @@ -1892,8 +1893,13 @@ public class SyncStorageEngine extends Handler { 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); |