commit e3fb871d1ebeef4622de637291ffe33d0ac22f1c
author Amit Mahajan <amitmahajan@google.com> Thu Oct 06 17:34:10 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 06 17:34:10 2016 +0000
tree ff58189bc296a808edf836007448245aae37e67c
parent a7e7124a9e4469e83c8f19899236d3ed55a3c8a5
parent 029332b21fd04eac31fe2281701ef871502b4144

Merge "Stop StkAppService when no CatService is available"

src/com/android/stk/StkAppService.java

diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index c2c8874..c8c8e38 100755
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -313,6 +313,7 @@
                 //If all StkServices are not available, stop itself and uninstall apk.
                 for (i = PhoneConstants.SIM_ID_1; i < mSimCount; i++) {
                     if (i != slotId
+                            && (mStkService[i] != null)
                             && (mStkContext[i].mStkServiceState == STATE_UNKNOWN
                             || mStkContext[i].mStkServiceState == STATE_EXIST)) {
                        break;