diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-28 09:13:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-28 09:13:53 -0700 |
| commit | eae040e663d81778e2b7898e1231b7c3812fe3fd (patch) | |
| tree | c24f843a02c5cdfa70dd9f6da55793cdf0597a05 | |
| parent | 786887217510e39f9f118ad533f4aad45b618766 (diff) | |
| parent | 6f999841d8c2192409847b41c40cab8cacb44f86 (diff) | |
| download | android_packages_apps_Stk-eae040e663d81778e2b7898e1231b7c3812fe3fd.tar.gz android_packages_apps_Stk-eae040e663d81778e2b7898e1231b7c3812fe3fd.tar.bz2 android_packages_apps_Stk-eae040e663d81778e2b7898e1231b7c3812fe3fd.zip | |
Merge "Enable the STK when insert two sim cards" into atel.lnx.2.0-dev
| -rw-r--r-- | src/com/android/stk/StkAppService.java | 6 |
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 { |