diff options
| author | Shreyas Basarge <snb@google.com> | 2016-02-20 01:01:10 +0000 |
|---|---|---|
| committer | Addison Nuding <addison@google.com> | 2016-02-26 23:56:31 +0000 |
| commit | dba2780444da3ab43a90ad14502f1e87e4b792b8 (patch) | |
| tree | 3c78bb1ff17159e096c8c19c0c296255f3002380 | |
| parent | 2e0fb0f559374102ebb3963819f6f3a816e77709 (diff) | |
| download | base-dba2780444da3ab43a90ad14502f1e87e4b792b8.tar.gz | |
NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05
am: 58048c1f17
* commit '58048c1f17d54166c6a048af2365d17dd32f4d57':
NPE fix for SyncStorageEngine read authority
(cherry picked from commit cddfdac381f40821688a2021c1acf3b2d755741b)
Change-Id: I0f6ce2a837eb5fe1daec2c57bcc15c20d06848fe
| -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); |