commit a4160473fb449d77b9e369e2f36486f0b8f98453
author Sooraj Sasindran <sasindran@google.com> Wed Oct 12 16:28:25 2016 -0700
committer Sooraj Sasindran <sasindran@google.com> Fri Oct 14 23:18:05 2016 +0000
tree 46380a579b4d94a4af624c6ff8840b8e869c63bc
parent dec3cd813b1fb76d68c4af05418c1f2698ff13a9

Introduce the config to disable LAUNCH_BROWSER

LAUNCH BROWSER STK command may need to be disabled
if carrier would not want the default behavior.
So introduce a carrierconfig key for the same.

Test: Swapped the sprint sim cards and verified
that browser launch do not happen

Merged-in:Icf6d206af60b0c84dcacbd6bd3326140f5a0f21a
BUG=31257758

Change-Id: Icf6d206af60b0c84dcacbd6bd3326140f5a0f21a

src/com/android/stk/StkAppService.java

diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index c8c8e38..b017a3e 100755
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -40,9 +40,11 @@
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
+import android.os.PersistableBundle;
 import android.os.PowerManager;
 import android.os.SystemProperties;
 import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.view.Gravity;
@@ -809,6 +811,28 @@
         return false;
     }
 
+    /**
+     * Get the boolean config from carrier config manager.
+     *
+     * @param context the context to get carrier service
+     * @param key config key defined in CarrierConfigManager
+     * @return boolean value of corresponding key.
+     */
+    private static boolean getBooleanCarrierConfig(Context context, String key) {
+        CarrierConfigManager configManager = (CarrierConfigManager) context.getSystemService(
+                Context.CARRIER_CONFIG_SERVICE);
+        PersistableBundle b = null;
+        if (configManager != null) {
+            b = configManager.getConfig();
+        }
+        if (b != null) {
+            return b.getBoolean(key);
+        } else {
+            // Return static default defined in CarrierConfigManager.
+            return CarrierConfigManager.getDefaultConfig().getBoolean(key);
+        }
+    }
+
     private void handleCmd(CatCmdMessage cmdMsg, int slotId) {
 
         if (cmdMsg == null) {
@@ -926,6 +950,15 @@
                 sendScreenBusyResponse(slotId);
                 break;
             }
+
+            /* Check if Carrier would not want to launch browser */
+            if (getBooleanCarrierConfig(mContext,
+                    CarrierConfigManager.KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL)) {
+                CatLog.d(this, "Browser is not launched as per carrier.");
+                sendResponse(RES_ID_DONE, slotId, true);
+                break;
+            }
+
             TextMessage alphaId = mStkContext[slotId].mCurrentCmd.geTextMessage();
             if ((mStkContext[slotId].mCurrentCmd.getBrowserSettings().mode
                     == LaunchBrowserMode.LAUNCH_IF_NOT_ALREADY_LAUNCHED) &&