Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 7f35fa7365

* commit '7f35fa7365b24f13f7553c452dc68f99fc7304ae':
  NPE fix for SyncStorageEngine read authority
This commit is contained in:
Shreyas Basarge
2016-02-20 02:22:00 +00:00
committed by android-build-merger
parent ba32b162a3 7f35fa7365
commit 08f781bd82
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/content/SyncStorageEngine.java
View File

@@ -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;
@@ -1900,8 +1901,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);