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

Merge "Don't ack/nak backup redundantly at exit"

Browse Source
This commit is contained in:
Christopher Tate
2011-06-07 15:37:08 -07:00
committed by Android (Google) Code Review
parent ba4b2faa09 ec5d4a0f97
commit 0a251cd5ee
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
packages/BackupRestoreConfirmation/src/com/android/backupconfirm/BackupRestoreConfirmation.java
View File

@@ -60,6 +60,7 @@ public class BackupRestoreConfirmation extends Activity {
IBackupManager mBackupManager;
FullObserver mObserver;
int mToken;
boolean mDidAcknowledge;
TextView mStatusView;
Button mAllowButton;
@@ -70,6 +71,7 @@ public class BackupRestoreConfirmation extends Activity {
Context mContext;
ObserverHandler(Context context) {
mContext = context;
mDidAcknowledge = false;
}
@Override
@@ -157,11 +159,7 @@ public class BackupRestoreConfirmation extends Activity {
mAllowButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
try {
mBackupManager.acknowledgeFullBackupOrRestore(mToken, true, mObserver);
} catch (RemoteException e) {
// TODO: bail gracefully if we can't contact the backup manager
}
sendAcknowledgement(mToken, true, mObserver);
mAllowButton.setEnabled(false);
mDenyButton.setEnabled(false);
}
@@ -170,11 +168,7 @@ public class BackupRestoreConfirmation extends Activity {
mDenyButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
try {
mBackupManager.acknowledgeFullBackupOrRestore(mToken, false, mObserver);
} catch (RemoteException e) {
// TODO: bail gracefully if we can't contact the backup manager
}
sendAcknowledgement(mToken, false, mObserver);
mAllowButton.setEnabled(false);
mDenyButton.setEnabled(false);
}
@@ -187,14 +181,21 @@ public class BackupRestoreConfirmation extends Activity {
// We explicitly equate departure from the UI with refusal. This includes the
// implicit configuration-changed stop/restart cycle.
try {
mBackupManager.acknowledgeFullBackupOrRestore(mToken, false, null);
} catch (RemoteException e) {
// if this fails we'll still time out with no acknowledgment
}
sendAcknowledgement(mToken, false, null);
finish();
}
void sendAcknowledgement(int token, boolean allow, IFullBackupRestoreObserver observer) {
if (!mDidAcknowledge) {
mDidAcknowledge = true;
try {
mBackupManager.acknowledgeFullBackupOrRestore(mToken, true, mObserver);
} catch (RemoteException e) {
// TODO: bail gracefully if we can't contact the backup manager
}
}
}
/**
* The observer binder for showing backup/restore progress. This binder just bounces
* the notifications onto the main thread.