diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-18 03:06:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-18 03:06:45 +0000 |
| commit | 997688291927133b1fd452b1a9730f078714f358 (patch) | |
| tree | b8bf5a0478d2d0ae8c0917a47ea613578147106d | |
| parent | 21fd46c9c4310750a2bd5f009a7c1b3047b0e52f (diff) | |
| parent | 3c42300621936065a6aef81fab33d4864a90ce7a (diff) | |
| download | Stk-997688291927133b1fd452b1a9730f078714f358.tar.gz | |
Merge "SIM Toolkit shall be able to remove the main menu on MSIM device"
| -rw-r--r-- | src/com/android/stk/StkAppService.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java index 055cbec..3d8d26e 100644 --- a/src/com/android/stk/StkAppService.java +++ b/src/com/android/stk/StkAppService.java @@ -126,7 +126,7 @@ public class StkAppService extends Service implements Runnable { protected LinkedList<DelayedCmd> mCmdsQ = null; protected boolean mCmdInProgress = false; protected int mStkServiceState = STATE_UNKNOWN; - protected int mSetupMenuState = STATE_UNKNOWN; + protected int mSetupMenuState = STATE_NOT_EXIST; protected int mMenuState = StkMenuActivity.STATE_INIT; protected int mOpCode = -1; private Activity mActivityInstance = null; @@ -1073,9 +1073,7 @@ public class StkAppService extends Service implements Runnable { mStkContext[slotId].mMainCmd = null; //Check other setup menu state. If all setup menu are removed, uninstall apk. for (i = PhoneConstants.SIM_ID_1; i < mSimCount; i++) { - if (i != slotId - && (mStkContext[i].mSetupMenuState == STATE_UNKNOWN - || mStkContext[i].mSetupMenuState == STATE_EXIST)) { + if (i != slotId && mStkContext[i].mSetupMenuState != STATE_NOT_EXIST) { CatLog.d(LOG_TAG, "Not Uninstall App:" + i + "," + mStkContext[i].mSetupMenuState); break; |