diff options
author | Wink Saville <wink@google.com> | 2013-02-20 22:23:18 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-02-20 22:23:18 +0000 |
commit | 534cedc2334f2e2ff26a78731289c7f52aa0978b (patch) | |
tree | 5c658682eeebcedec41190b973e5d406a0121245 /src/com/android | |
parent | 68fdeeae67e8f8e13978e3adbad0429815439f83 (diff) | |
parent | c7c3a46ff0191ceaf086d80800665c5be0022dc3 (diff) | |
download | Stk-534cedc2334f2e2ff26a78731289c7f52aa0978b.tar.gz |
Merge "Dismiss Get In Key dialog after the timeout sent by the card"
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/stk/StkInputActivity.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/stk/StkInputActivity.java b/src/com/android/stk/StkInputActivity.java index b6228fb..fb81469 100644 --- a/src/com/android/stk/StkInputActivity.java +++ b/src/com/android/stk/StkInputActivity.java @@ -256,9 +256,14 @@ public class StkInputActivity extends Activity implements View.OnClickListener, } private void startTimeOut() { + int duration = StkApp.calculateDurationInMilis(mStkInput.duration); + + if (duration <= 0) { + duration = StkApp.UI_TIMEOUT; + } cancelTimeOut(); mTimeoutHandler.sendMessageDelayed(mTimeoutHandler - .obtainMessage(MSG_ID_TIMEOUT), StkApp.UI_TIMEOUT); + .obtainMessage(MSG_ID_TIMEOUT), duration); } private void configInputDisplay() { |