diff options
| author | -b master <yamasani@google.com> | 2009-07-06 17:44:41 -0700 |
|---|---|---|
| committer | -b master <yamasani@google.com> | 2009-07-06 17:44:41 -0700 |
| commit | f6a34dd6ab7f4803a2bbfed1cc8910e879e6a79d (patch) | |
| tree | 653816fd5d2e6d72dace50f747521d6d6d20724d /core/java/android/content/SyncStorageEngine.java | |
| parent | a2b5dab5b7796d3967c73df95154810ae38efd82 (diff) | |
| parent | b71951591d72cddb4dbc3d39778dfcb5597a5733 (diff) | |
| download | frameworks_base-f6a34dd6ab7f4803a2bbfed1cc8910e879e6a79d.zip frameworks_base-f6a34dd6ab7f4803a2bbfed1cc8910e879e6a79d.tar.gz frameworks_base-f6a34dd6ab7f4803a2bbfed1cc8910e879e6a79d.tar.bz2 | |
resolved conflicts for merge of b7195159 to master
Diffstat (limited to 'core/java/android/content/SyncStorageEngine.java')
| -rw-r--r-- | core/java/android/content/SyncStorageEngine.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/core/java/android/content/SyncStorageEngine.java b/core/java/android/content/SyncStorageEngine.java index aaba7c7..13bcdd3 100644 --- a/core/java/android/content/SyncStorageEngine.java +++ b/core/java/android/content/SyncStorageEngine.java @@ -25,6 +25,7 @@ import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlSerializer; import android.accounts.Account; +import android.backup.IBackupManager; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteException; @@ -36,6 +37,7 @@ import android.os.Message; import android.os.Parcel; import android.os.RemoteCallbackList; import android.os.RemoteException; +import android.os.ServiceManager; import android.util.Log; import android.util.SparseArray; import android.util.Xml; @@ -339,8 +341,18 @@ public class SyncStorageEngine extends Handler { } } } + // Inform the backup manager about a data change + IBackupManager ibm = IBackupManager.Stub.asInterface( + ServiceManager.getService(Context.BACKUP_SERVICE)); + if (ibm != null) { + try { + ibm.dataChanged("com.android.providers.settings"); + } catch (RemoteException e) { + // Try again later + } + } } - + public boolean getSyncAutomatically(Account account, String providerName) { synchronized (mAuthorities) { if (account != null) { |