diff options
| author | Shreyas Basarge <snb@google.com> | 2016-02-20 01:01:10 +0000 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-02-26 14:33:56 -0800 |
| commit | d3383d5bfab296ba3adbc121ff8a7b542bde4afb (patch) | |
| tree | ee27820cc68292203f6832fd77c2648dfbe6eace | |
| parent | 63363af721650e426db5b0bdfb8b2d4fe36abdb0 (diff) | |
| download | base-d3383d5bfab296ba3adbc121ff8a7b542bde4afb.tar.gz | |
NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r10android-5.1.1_r37
am: 58048c1f17
* commit '58048c1f17d54166c6a048af2365d17dd32f4d57':
NPE fix for SyncStorageEngine read authority
| -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 1bd1709c74a7..6adb37eb334e 100644 --- a/services/core/java/com/android/server/content/SyncStorageEngine.java +++ b/services/core/java/com/android/server/content/SyncStorageEngine.java @@ -44,6 +44,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; @@ -1868,8 +1869,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); |