Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fc321a6 authored by Shreyas Basarge's avatar Shreyas Basarge Committed by android-build-merger
Browse files

NPE fix for SyncStorageEngine read authority am: a962d9eb am: 339c4f2b am: 58048c1f 

am: eec587ed

* commit 'eec587ed':
  NPE fix for SyncStorageEngine read authority
parents 9c841923 eec587ed

services/core/java/com/android/server/content/SyncStorageEngine.java

+8 −2
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ import android.util.Pair; 
import android.util.SparseArray;

import android.util.SparseArray;

import android.util.ArrayMap;

import android.util.ArrayMap;

import android.util.Xml;

import android.util.Xml;

import android.util.EventLog;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.ArrayUtils;
@@ -1868,9 +1869,14 @@ public class SyncStorageEngine extends Handler { 
                            if ("authority".equals(tagName)) {

                            if ("authority".equals(tagName)) {

                                authority = parseAuthority(parser, version);

                                authority = parseAuthority(parser, version);

                                periodicSync = null;

                                periodicSync = null;

                                if (authority != null) {

                                    if (authority.ident > highestAuthorityId) {

                                    if (authority.ident > highestAuthorityId) {

                                        highestAuthorityId = authority.ident;

                                        highestAuthorityId = authority.ident;

                                    }

                                    }

                                } else {

                                    EventLog.writeEvent(0x534e4554, "26513719", -1,

                                            "Malformed authority");

                                }

                            } else if (XML_TAG_LISTEN_FOR_TICKLES.equals(tagName)) {

                            } else if (XML_TAG_LISTEN_FOR_TICKLES.equals(tagName)) {

                                parseListenForTickles(parser);

                                parseListenForTickles(parser);

                            }

                            }