commit c1bcd7c747378eccac029a160d827b745d56b575
author justinweng <justinweng@google.com> Wed Jun 26 01:15:28 2019 +0800
committer George Gao <georgao@codeaurora.org> Wed Apr 08 15:02:49 2020 -0700
tree 63b6330547753bc8d9f61a1c794b88fd9af806ab
parent d5395158d3e3498624d216875f7b598d0c65e87c

hal: always check operator numeric

If user inserted a TMUS SIM and make the first call. Even user replaces
another SIM, HAL will keep to use TMUS audio table.

If user inserted a general SIM and make the first call. Even user
replaces a TMUS SIM, HAL will not use TMUS audio table.

Bug: 133648439
Test: make a call

Change-Id: Ie7b9455ef31c9dd6826236df41965b1d96d75892
Signed-off-by: justinweng <justinweng@google.com>
(cherry picked from commit a47c7f71de1770d57179d3b03d58ced37c3a4234)
Signed-off-by: Aniket Kumar Lata <alata@codeaurora.org>

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index e624250..c90e68a 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1525,9 +1525,6 @@
 #define ULL_PLATFORM_DELAY         (3*1000LL)
 #define MMAP_PLATFORM_DELAY        (3*1000LL)
 
-static pthread_once_t check_op_once_ctl = PTHREAD_ONCE_INIT;
-static bool is_tmus = false;
-
 static bool is_usb_snd_dev(snd_device_t snd_device)
 {
     if (snd_device < SND_DEVICE_IN_BEGIN) {
@@ -1549,7 +1546,7 @@
     return false;
 }
 
-static void check_operator()
+bool is_operator_tmus()
 {
     char value[PROPERTY_VALUE_MAX];
     int mccmnc;
@@ -1574,17 +1571,12 @@
     case 310210:
     case 310200:
     case 310160:
-        is_tmus = true;
-        break;
+        return true;
+    default:
+        return false;
     }
 }
 
-bool is_operator_tmus()
-{
-    pthread_once(&check_op_once_ctl, check_operator);
-    return is_tmus;
-}
-
 static char *get_current_operator()
 {
     struct listnode *node;