commit c00bdaaa615c5de4f74e25cec721b175016f958b
author Wink Saville <wink@google.com> Wed Feb 20 14:56:57 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 20 14:56:57 2013 -0800
tree 4dc7436553e793f1b4acfffd9845458f3535b50d
parent 70a45cf48ed2cebe54f2a3bebb2da7ed6251730a
parent 534cedc2334f2e2ff26a78731289c7f52aa0978b

am 534cedc2: Merge "Dismiss Get In Key dialog after the timeout sent by the card"

* commit '534cedc2334f2e2ff26a78731289c7f52aa0978b':
  Dismiss Get In Key dialog after the timeout sent by the card

src/com/android/stk/StkInputActivity.java

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 @@
     }
 
     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() {