diff options
Diffstat (limited to 'core/java/android/backup')
| -rw-r--r-- | core/java/android/backup/BackupHelperAgent.java | 4 | ||||
| -rw-r--r-- | core/java/android/backup/BackupHelperDispatcher.java | 3 | ||||
| -rw-r--r-- | core/java/android/backup/IBackupManager.aidl | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/core/java/android/backup/BackupHelperAgent.java b/core/java/android/backup/BackupHelperAgent.java index f7eb1b8..3720d50 100644 --- a/core/java/android/backup/BackupHelperAgent.java +++ b/core/java/android/backup/BackupHelperAgent.java @@ -39,9 +39,9 @@ public class BackupHelperAgent extends BackupAgent { } @Override - public void onRestore(BackupDataInput data, ParcelFileDescriptor newState) + public void onRestore(BackupDataInput data, int appVersionCode, ParcelFileDescriptor newState) throws IOException { - mDispatcher.performRestore(data, newState); + mDispatcher.performRestore(data, appVersionCode, newState); } public BackupHelperDispatcher getDispatcher() { diff --git a/core/java/android/backup/BackupHelperDispatcher.java b/core/java/android/backup/BackupHelperDispatcher.java index e9a8f71..b25c3e3 100644 --- a/core/java/android/backup/BackupHelperDispatcher.java +++ b/core/java/android/backup/BackupHelperDispatcher.java @@ -46,7 +46,8 @@ public class BackupHelperDispatcher { } } - public void performRestore(BackupDataInput input, ParcelFileDescriptor newState) + public void performRestore(BackupDataInput input, int appVersionCode, + ParcelFileDescriptor newState) throws IOException { boolean alreadyComplained = false; diff --git a/core/java/android/backup/IBackupManager.aidl b/core/java/android/backup/IBackupManager.aidl index efc664c..d6283d0 100644 --- a/core/java/android/backup/IBackupManager.aidl +++ b/core/java/android/backup/IBackupManager.aidl @@ -33,19 +33,19 @@ interface IBackupManager { * Tell the system service that the caller has made changes to its * data, and therefore needs to undergo an incremental backup pass. */ - oneway void dataChanged(String packageName); + void dataChanged(String packageName); /** * Notifies the Backup Manager Service that an agent has become available. This * method is only invoked by the Activity Manager. */ - oneway void agentConnected(String packageName, IBinder agent); + void agentConnected(String packageName, IBinder agent); /** * Notify the Backup Manager Service that an agent has unexpectedly gone away. * This method is only invoked by the Activity Manager. */ - oneway void agentDisconnected(String packageName); + void agentDisconnected(String packageName); /** * Schedule an immediate backup attempt for all pending updates. This is @@ -57,7 +57,7 @@ interface IBackupManager { * * <p>Callers must hold the android.permission.BACKUP permission to use this method. */ - oneway void backupNow(); + void backupNow(); /** * Identify the currently selected transport. Callers must hold the |