summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhoonsung.park <hoonsung.park@lge.com>2015-07-10 09:48:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-10 09:48:54 +0000
commite0cee3f2504de78b97e4ba4320375cda920c74fa (patch)
tree08e3dd5170f0b186b89b95c00dfd115e2a458b00
parent6f8605e31d5e5104507e13bea76d9d87fb7ebf0c (diff)
parentcba2996aa661e04e591a7ecb48369cc9289a3bf6 (diff)
downloadandroid_packages_apps_Stk-e0cee3f2504de78b97e4ba4320375cda920c74fa.tar.gz
android_packages_apps_Stk-e0cee3f2504de78b97e4ba4320375cda920c74fa.tar.bz2
android_packages_apps_Stk-e0cee3f2504de78b97e4ba4320375cda920c74fa.zip
am cba2996a: UICC: Destroy input activity when the terminal responose is sent.
* commit 'cba2996aa661e04e591a7ecb48369cc9289a3bf6': UICC: Destroy input activity when the terminal responose is sent.
-rw-r--r--src/com/android/stk/StkInputActivity.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/stk/StkInputActivity.java b/src/com/android/stk/StkInputActivity.java
index 39c574d..53bea93 100644
--- a/src/com/android/stk/StkInputActivity.java
+++ b/src/com/android/stk/StkInputActivity.java
@@ -172,6 +172,10 @@ public class StkInputActivity extends Activity implements View.OnClickListener,
"], slot id: " + mSlotId);
startTimeOut();
appService.getStkContext(mSlotId).setPendingActivityInstance(null);
+ if (mIsResponseSent) {
+ cancelTimeOut();
+ finish();
+ }
}
@Override