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

Commit 50addddb authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix potential crash in sync. 

Change-Id: I523d8faa24b7ba57dcc09cbe91b5cb91d9f6f262
parent 7e9f4eb2

core/java/android/content/SyncManager.java

+2 −1
Original line number Diff line number Diff line
@@ -1696,16 +1696,17 @@ public class SyncManager implements OnAccountsUpdateListener { 
                Log.v(TAG, "runStateIdle: setting mActiveSyncContext to " + mActiveSyncContext);

            }

            mSyncStorageEngine.setActiveSync(mActiveSyncContext);

            mSyncWakeLock.setWorkSource(new WorkSource(syncAdapterInfo.uid));

            if (!activeSyncContext.bindToSyncAdapter(syncAdapterInfo)) {

                Log.e(TAG, "Bind attempt failed to " + syncAdapterInfo);

                mActiveSyncContext.close();

                mActiveSyncContext = null;

                mSyncStorageEngine.setActiveSync(mActiveSyncContext);

                mSyncWakeLock.setWorkSource(null);

                runStateIdle();

                return;

            }



            mSyncWakeLock.setWorkSource(new WorkSource(syncAdapterInfo.uid));

            mSyncWakeLock.acquire();

            // no need to schedule an alarm, as that will be done by our caller.