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

Commit 1bbcd105 authored by Fred Quintana's avatar Fred Quintana
Browse files

fix an NPE in SyncManager's dump where it can get a null AuthorityInfo;... 

fix an NPE in SyncManager's dump where it can get a null AuthorityInfo; instead create one if one doesn't exist yet
parent 751fdc09

core/java/android/content/SyncManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ public class SyncManager implements OnAccountsUpdateListener { 
                    continue;

                }



                SyncStorageEngine.AuthorityInfo settings = mSyncStorageEngine.getAuthority(

                SyncStorageEngine.AuthorityInfo settings = mSyncStorageEngine.getOrCreateAuthority(

                        account, syncAdapterType.type.authority);

                SyncStatusInfo status = mSyncStorageEngine.getOrCreateSyncStatus(settings);

                pw.print("    "); pw.print(settings.authority);

core/java/android/content/SyncStorageEngine.java

+4 −2
Original line number Diff line number Diff line
@@ -632,9 +632,11 @@ public class SyncStorageEngine extends Handler { 
        }

    }



    public AuthorityInfo getAuthority(Account account, String authority) {

    public AuthorityInfo getOrCreateAuthority(Account account, String authority) {

        synchronized (mAuthorities) {

            return getAuthorityLocked(account, authority, null);

            return getOrCreateAuthorityLocked(account, authority,

                    -1 /* assign a new identifier if creating a new authority */,

                    true /* write to storage if this results in a change */);

        }

    }