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

am 11ef84c8: am 6af40c83: Merge "Fix issue #21799741: AbstractThreadedSyncAdapter crashes..." into mnc-dev

Browse Source 
* commit '11ef84c8db8c31afd91b90ac4091e64ad5e7c3ca':
  Fix issue #21799741: AbstractThreadedSyncAdapter crashes...
This commit is contained in:
Dianne Hackborn
2015-06-23 18:07:44 +00:00
committed by Android Git Automerger
parent d5f1548337 11ef84c8db
commit 80e364a71a
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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

1
api/system-current.txt
View File

@@ -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

18
core/java/android/content/AbstractThreadedSyncAdapter.java
View File

@@ -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