diff options
author | Christopher Tate <ctate@google.com> | 2009-06-16 11:02:01 -0700 |
---|---|---|
committer | Christopher Tate <ctate@google.com> | 2009-06-16 13:58:17 -0700 |
commit | f68eb500f99361541049e09eb7f9ddd6f4ef4efa (patch) | |
tree | ccb031f408b087de63baf720b13779d4d989a61d /services | |
parent | 5633034f79bfa67c4219f16fd6d23e962e800be2 (diff) | |
download | frameworks_base-f68eb500f99361541049e09eb7f9ddd6f4ef4efa.zip frameworks_base-f68eb500f99361541049e09eb7f9ddd6f4ef4efa.tar.gz frameworks_base-f68eb500f99361541049e09eb7f9ddd6f4ef4efa.tar.bz2 |
More bmgr work; fix clear-data signalling
The 'list sets' and 'restore token#' commands from bmgr now do what they are
supposed to. At this point we see the restore target's data being cleared
properly and its agent being launched and invoked for restore.
Diffstat (limited to 'services')
-rw-r--r-- | services/java/com/android/server/BackupManagerService.java | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java index 2f964ba..4742636 100644 --- a/services/java/com/android/server/BackupManagerService.java +++ b/services/java/com/android/server/BackupManagerService.java @@ -121,6 +121,7 @@ class BackupManagerService extends IBackupManager.Stub { private volatile boolean mClearingData; private int mTransportId; + private RestoreSession mActiveRestoreSession; private File mStateDir; private File mDataDir; @@ -427,7 +428,7 @@ class BackupManagerService extends IBackupManager.Stub { break; default: - Log.e(TAG, "creating unknown transport " + transportID); + Log.e(TAG, "Asked for unknown transport " + transportID); } return transport; } @@ -495,7 +496,7 @@ class BackupManagerService extends IBackupManager.Stub { throws android.os.RemoteException { synchronized(mClearDataLock) { mClearingData = false; - notifyAll(); + mClearDataLock.notifyAll(); } } } @@ -962,12 +963,22 @@ class BackupManagerService extends IBackupManager.Stub { // Hand off a restore session public IRestoreSession beginRestoreSession(int transportID) { mContext.enforceCallingPermission("android.permission.BACKUP", "beginRestoreSession"); - return null; + + synchronized(this) { + if (mActiveRestoreSession != null) { + Log.d(TAG, "Restore session requested but one already active"); + return null; + } + mActiveRestoreSession = new RestoreSession(transportID); + } + return mActiveRestoreSession; } // ----- Restore session ----- class RestoreSession extends IRestoreSession.Stub { + private static final String TAG = "RestoreSession"; + private IBackupTransport mRestoreTransport = null; RestoreSet[] mRestoreSets = null; @@ -980,12 +991,18 @@ class BackupManagerService extends IBackupManager.Stub { mContext.enforceCallingPermission("android.permission.BACKUP", "getAvailableRestoreSets"); + try { synchronized(this) { if (mRestoreSets == null) { mRestoreSets = mRestoreTransport.getAvailableRestoreSets(); } return mRestoreSets; } + } catch (RuntimeException e) { + Log.d(TAG, "getAvailableRestoreSets exception"); + e.printStackTrace(); + throw e; + } } public int performRestore(int token) throws android.os.RemoteException { @@ -1001,6 +1018,8 @@ class BackupManagerService extends IBackupManager.Stub { return 0; } } + } else { + if (DEBUG) Log.v(TAG, "No current restore set, not doing restore"); } return -1; } @@ -1011,6 +1030,13 @@ class BackupManagerService extends IBackupManager.Stub { mRestoreTransport.endSession(); mRestoreTransport = null; + synchronized(BackupManagerService.this) { + if (BackupManagerService.this.mActiveRestoreSession == this) { + BackupManagerService.this.mActiveRestoreSession = null; + } else { + Log.e(TAG, "ending non-current restore session"); + } + } } } |