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

Commit 6af40c83 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #21799741: AbstractThreadedSyncAdapter crashes..." into mnc-dev

parents de1e281b d01ed46c

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7211,6 +7211,7 @@ package android.content { 
    method public android.content.Context getContext();

    method public final android.os.IBinder getSyncAdapterBinder();

    method public abstract void onPerformSync(android.accounts.Account, android.os.Bundle, java.lang.String, android.content.ContentProviderClient, android.content.SyncResult);

    method public void onSecurityException(android.accounts.Account, android.os.Bundle, java.lang.String, android.content.SyncResult);

    method public void onSyncCanceled();

    method public void onSyncCanceled(java.lang.Thread);

    field public static final deprecated int LOG_SYNC_DETAILS = 2743; // 0xab7

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7436,6 +7436,7 @@ package android.content { 
    method public android.content.Context getContext();

    method public final android.os.IBinder getSyncAdapterBinder();

    method public abstract void onPerformSync(android.accounts.Account, android.os.Bundle, java.lang.String, android.content.ContentProviderClient, android.content.SyncResult);

    method public void onSecurityException(android.accounts.Account, android.os.Bundle, java.lang.String, android.content.SyncResult);

    method public void onSyncCanceled();

    method public void onSyncCanceled(java.lang.Thread);

    field public static final deprecated int LOG_SYNC_DETAILS = 2743; // 0xab7

core/java/android/content/AbstractThreadedSyncAdapter.java

+18 −0
Original line number Diff line number Diff line
@@ -274,6 +274,10 @@ public abstract class AbstractThreadedSyncAdapter { 
                } else {

                    syncResult.databaseError = true;

                }

            } catch (SecurityException e) {

                AbstractThreadedSyncAdapter.this.onSecurityException(mAccount, mExtras,

                        mAuthority, syncResult);

                syncResult.databaseError = true;

            } finally {

                Trace.traceEnd(Trace.TRACE_TAG_SYNC_MANAGER);
@@ -318,6 +322,20 @@ public abstract class AbstractThreadedSyncAdapter { 
    public abstract void onPerformSync(Account account, Bundle extras,

            String authority, ContentProviderClient provider, SyncResult syncResult);



    /**

     * Report that there was a security exception when opening the content provider

     * prior to calling {@link #onPerformSync}.  This will be treated as a sync

     * database failure.

     *

     * @param account the account that attempted to sync

     * @param extras SyncAdapter-specific parameters

     * @param authority the authority of the failed sync request

     * @param syncResult SyncAdapter-specific parameters

     */

    public void onSecurityException(Account account, Bundle extras,

            String authority, SyncResult syncResult) {

    }



    /**

     * Indicates that a sync operation has been canceled. This will be invoked on a separate

     * thread than the sync thread and so you must consider the multi-threaded implications