commit ede6aba88b977715810f7cf2cef32cbba299c88f
author Legler Wu <legler.wu@mediatek.com> Wed Jan 21 01:57:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 21 01:57:47 2015 +0000
tree 834852ab9e071b4fda0f753717b449d1cf86368e
parent d560e05a8c086dabbb36edd204366633d622b863
parent c32560e69a3dc13ad96287629271002c6d02c9f9

am c32560e6: [DS] SIM Toolkit icon should not be shown if SIM don\'t support SIM Toolkit

* commit 'c32560e69a3dc13ad96287629271002c6d02c9f9':
  [DS] SIM Toolkit icon should not be shown if SIM don't support SIM Toolkit

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3f69b32..097cf47 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -34,6 +34,7 @@
         <activity android:name="StkMain"
             android:theme="@android:style/Theme.NoDisplay"
             android:label="@string/app_name"
+            android:enabled="false"
             android:taskAffinity="android.task.stk.StkLauncherActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

src/com/android/stk/StkAppInstaller.java

diff --git a/src/com/android/stk/StkAppInstaller.java b/src/com/android/stk/StkAppInstaller.java
index 3208ba8..2d06e59 100644
--- a/src/com/android/stk/StkAppInstaller.java
+++ b/src/com/android/stk/StkAppInstaller.java
@@ -31,7 +31,7 @@
  *
  */
 abstract class StkAppInstaller {
-    private static final String STK_LAUNCHER_ACTIVITY = "com.android.stk.StkLauncherActivity";
+    private static final String STK_MAIN_ACTIVITY = "com.android.stk.StkMain";
     private static final String LOG_TAG = "StkAppInstaller";
 
     private StkAppInstaller() {
@@ -57,7 +57,7 @@
             CatLog.d(LOG_TAG, "[setAppState]- no package manager, just return.");
             return;
         }
-        ComponentName cName = new ComponentName("com.android.stk", STK_LAUNCHER_ACTIVITY);
+        ComponentName cName = new ComponentName("com.android.stk", STK_MAIN_ACTIVITY);
         int state = install ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
                 : PackageManager.COMPONENT_ENABLED_STATE_DISABLED;