summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYujing Gu <guy@codeaurora.org>2015-11-10 17:00:21 +0800
committerLukasz Patron <priv.luk@gmail.com>2018-01-06 13:37:01 +0000
commit22eb15438c40463425befa1106de716899f0af0b (patch)
tree36998dbf8c59a951d5cad650ae177d291a9a4ee4
parent51ad28d3fae6b0110ddbc40dcbe7c16a57c85b22 (diff)
downloadandroid_packages_apps_Stk-staging/lineage-15.1.tar.gz
android_packages_apps_Stk-staging/lineage-15.1.tar.bz2
android_packages_apps_Stk-staging/lineage-15.1.zip
STK application should not show the STK menu for unsupported card.staging/lineage-15.1
When card doesn't support STK, STK application should not show the STK menu. CRs-Fixed: 937389 Change-Id: I6d329142202c6fb59672a74a894d2e8f3237ce24
-rwxr-xr-xsrc/com/android/stk/StkLauncherActivity.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/stk/StkLauncherActivity.java b/src/com/android/stk/StkLauncherActivity.java
index a5271f6..ef4784f 100755
--- a/src/com/android/stk/StkLauncherActivity.java
+++ b/src/com/android/stk/StkLauncherActivity.java
@@ -176,6 +176,10 @@ public class StkLauncherActivity extends ListActivity {
for (int i = 0; i < simCount; i++) {
//Check if the card is inserted.
if (mTm.hasIccCard(i)) {
+ if (appService == null || appService.getMainMenu(i) == null) {
+ CatLog.d(LOG_TAG, "SIM " + i + " main menu of STK in the card is null");
+ continue;
+ }
CatLog.d(LOG_TAG, "SIM " + i + " add to menu.");
mSingleSimId = i;
stkMenuTitle = appService.getMainMenu(i).title;