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

Clear state when ProgressMessageCtrl. is canceled

Browse Source 
Otherwise the following can happen:
- The progressController is _not_ running and we are running through
  an update.
- Then onUpdateCompleted is called which cancels the not running
  progressController. This then reset whatever state was previously
  stored as mPreviousState leaving the PrintActivity in a weird state.

Fixes: 27945565
Change-Id: Id46b8853ba634634198a74921c8a1790c435678c
This commit is contained in:
Philip P. Moltmann
2016-05-12 10:29:15 -07:00
parent 808f2c361a
commit 9a40a32ae9
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
View File

@@ -683,6 +683,10 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
}
});
} else if (resultCode == RESULT_CANCELED) {
if (DEBUG) {
Log.i(LOG_TAG, "[state]" + STATE_CONFIGURING);
}
mState = STATE_CONFIGURING;
// The previous update might have been canceled
@@ -898,9 +902,15 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
private void setState(int state) {
if (isFinalState(mState)) {
if (isFinalState(state)) {
if (DEBUG) {
Log.i(LOG_TAG, "[state]" + state);
}
mState = state;
}
} else {
if (DEBUG) {
Log.i(LOG_TAG, "[state]" + state);
}
mState = state;
}
}
@@ -2896,13 +2906,20 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
}
public int cancel() {
if (!mPosted) {
return getStateAfterCancel();
}
mPosted = false;
mHandler.removeCallbacks(this);
int state;
return getStateAfterCancel();
if (!mPosted) {
state = getStateAfterCancel();
} else {
mPosted = false;
mHandler.removeCallbacks(this);
state = getStateAfterCancel();
}
mPreviousState = -1;
return state;
}
@Override