summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFang Yunong <yunong@codeaurora.org>2016-09-19 17:08:39 +0800
committerFang Yunong <yunong@codeaurora.org>2016-09-26 20:42:07 +0800
commit6f999841d8c2192409847b41c40cab8cacb44f86 (patch)
tree8dc44d6e25ab4c63bb2741e1f8f9f6f25860fab1
parentb675fb4abd9f08c86341438c65e5c6b1be33eb13 (diff)
downloadandroid_packages_apps_Stk-6f999841d8c2192409847b41c40cab8cacb44f86.tar.gz
android_packages_apps_Stk-6f999841d8c2192409847b41c40cab8cacb44f86.tar.bz2
android_packages_apps_Stk-6f999841d8c2192409847b41c40cab8cacb44f86.zip
Enable the STK when insert two sim cards
Enable the app of STK when insert two sim cards, and one sim with STK,the other one without STK. Change-Id: If50186997af0f34b6ecf3d91791f1be77f700653 CRs-Fixed: 1062708
-rw-r--r--src/com/android/stk/StkAppService.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index 712d747..ff8227a 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -944,8 +944,12 @@ public class StkAppService extends Service implements Runnable {
CatLog.d(LOG_TAG, "removeMenu() - Uninstall App");
mStkContext[slotId].mCurrentMenu = null;
mStkContext[slotId].mMainCmd = null;
+ boolean menuState = false;
//Check other setup menu state. If all setup menu are removed, uninstall apk.
for (i = PhoneConstants.SIM_ID_1; i < mSimCount; i++) {
+ if (mStkContext[i].mSetupMenuState == STATE_EXIST) {
+ menuState = true;
+ }
if (i != slotId
&& (mStkContext[slotId].mSetupMenuState == STATE_UNKNOWN
|| mStkContext[slotId].mSetupMenuState == STATE_EXIST)) {
@@ -954,7 +958,7 @@ public class StkAppService extends Service implements Runnable {
break;
}
}
- if (i == mSimCount) {
+ if (i == mSimCount && !menuState) {
StkAppInstaller.unInstall(mContext);
}
} else {