From 1d1111efcd9aea2435bb6dc5ba90ffb88a7a397c Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
Date: Tue, 20 Mar 2018 15:45:25 -0700
Subject: Identify MMI codes specific to some OEM devices via hard-coding.

Bug: 72162360
Test: SpecialCharSequenceMgrTest, TranssionUtilsTest
PiperOrigin-RevId: 189825957
Change-Id: Ia161ad47c4122d33c108b545540707bb18076464
---
 .../dialer/dialpadview/SpecialCharSequenceMgr.java | 39 +++++-----------------
 1 file changed, 8 insertions(+), 31 deletions(-)

(limited to 'java/com/android/dialer/dialpadview')

diff --git a/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java b/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java
index d88bac3f7..9929ddd3b 100644
--- a/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java
+++ b/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java
@@ -59,11 +59,10 @@ import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment.Selec
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.telephony.TelephonyManagerCompat;
-import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.oem.MotorolaUtils;
+import com.android.dialer.oem.TranssionUtils;
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.PermissionsUtil;
-import com.google.common.collect.ImmutableSet;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.WriterException;
@@ -73,15 +72,7 @@ import java.util.List;
 import java.util.Locale;
 
 /**
- * Helper class to listen for some magic character sequences that are handled specially by the
- * dialer.
- *
- * <p>Note the Phone app also handles these sequences too (in a couple of relatively obscure places
- * in the UI), so there's a separate version of this class under apps/Phone.
- *
- * <p>TODO: there's lots of duplicated code between this class and the corresponding class under
- * apps/Phone. Let's figure out a way to unify these two classes (in the framework? in a common
- * shared library?)
+ * Helper class to listen for some magic character sequences that are handled specially by Dialer.
  */
 public class SpecialCharSequenceMgr {
   private static final String TAG_SELECT_ACCT_FRAGMENT = "tag_select_acct_fragment";
@@ -94,9 +85,6 @@ public class SpecialCharSequenceMgr {
   private static final String ADN_NAME_COLUMN_NAME = "name";
   private static final int ADN_QUERY_TOKEN = -1;
 
-  /** Comma separated MMI codes specific to OEM/device. */
-  @VisibleForTesting static final String CONFIG_OEM_MMI_CODES_CSV = "oem_mmi_codes_csv";
-
   /**
    * Remembers the previous {@link QueryHandler} and cancel the operation when needed, to prevent
    * possible crash.
@@ -158,6 +146,12 @@ public class SpecialCharSequenceMgr {
    * @return true if a secret code was encountered and handled
    */
   static boolean handleSecretCode(Context context, String input) {
+    // Secret code specific to OEMs should be handled first.
+    if (TranssionUtils.isTranssionSecretCode(input)) {
+      TranssionUtils.handleTranssionSecretCode(context, input);
+      return true;
+    }
+
     // Secret codes are accessed by dialing *#*#<code>#*#* or "*#<code_starting_with_number>#"
     if (input.length() > 8 && input.startsWith("*#*#") && input.endsWith("#*#*")) {
       String secretCode = input.substring(4, input.length() - 4);
@@ -165,26 +159,9 @@ public class SpecialCharSequenceMgr {
       return true;
     }
 
-    if (getOemSecretCodes(context).contains(input)) {
-      String secretCode = input.substring(2, input.length() - 1);
-      TelephonyManagerCompat.handleSecretCode(context, secretCode);
-      return true;
-    }
     return false;
   }
 
-  /**
-   * Get the OEM codes from the config provider. The config provider should be aware of the device
-   * and manufacturer.
-   */
-  private static ImmutableSet<String> getOemSecretCodes(Context context) {
-    String csv = ConfigProviderBindings.get(context).getString(CONFIG_OEM_MMI_CODES_CSV, null);
-    if (TextUtils.isEmpty(csv)) {
-      return ImmutableSet.of();
-    }
-    return ImmutableSet.copyOf(csv.split(","));
-  }
-
   /**
    * Handle ADN requests by filling in the SIM contact number into the requested EditText.
    *
-- 
cgit v1.2.3