diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-06-23 16:45:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 16:45:50 +0000 |
| commit | 6af40c833890356e6a48c8f32feab1bd768d2480 (patch) | |
| tree | 4daa36b85a2c86e0056d41417bd17caa395c1c41 /api | |
| parent | de1e281bbc062410a9079d2640b760271bde1043 (diff) | |
| parent | d01ed46c633912895ac4d9dc0804dac8f7fe9069 (diff) | |
| download | frameworks_base-6af40c833890356e6a48c8f32feab1bd768d2480.zip frameworks_base-6af40c833890356e6a48c8f32feab1bd768d2480.tar.gz frameworks_base-6af40c833890356e6a48c8f32feab1bd768d2480.tar.bz2 | |
Merge "Fix issue #21799741: AbstractThreadedSyncAdapter crashes..." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index a538d86..9cb8d59 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 diff --git a/api/system-current.txt b/api/system-current.txt index 57581e2..9544f5b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 |