commit 8ffca3e4b7b42d2449cbc5000130c8e08994e280
author Pankaj Kanwar <pkanwar@google.com> Thu Aug 17 20:46:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 17 20:46:03 2017 +0000
tree fd52b57e90a5a5d070d0af8466a14cccd494a6e7
parent e0d1ef864d5f8d305ea6f39fabed8f32556388a1
parent 778de407af4acc419ab86825475517f2e2d09ad0

Merge "Wrong index can disable the STK application unintentionally"
am: 778de407af

Change-Id: I65392c517e3e3deca43af8ca783f01654b8c8a5c

src/com/android/stk/StkAppService.java

diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index 19c928b..eba699e 100755
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -919,10 +919,10 @@
                 //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[slotId].mSetupMenuState == STATE_UNKNOWN
-                            || mStkContext[slotId].mSetupMenuState == STATE_EXIST)) {
+                            && (mStkContext[i].mSetupMenuState == STATE_UNKNOWN
+                            || mStkContext[i].mSetupMenuState == STATE_EXIST)) {
                         CatLog.d(LOG_TAG, "Not Uninstall App:" + i + ","
-                                + mStkContext[slotId].mSetupMenuState);
+                                + mStkContext[i].mSetupMenuState);
                         break;
                     }
                 }