commit 96eaeb97b8ec1cbb023d190a4daff58ef9c658d8
author xiangyu.deng <xiangyu.deng@t2mobile.com> Wed May 25 14:14:56 2022 +0800
committer xiangyu.deng <xiangyu.deng@t2mobile.com> Wed May 25 14:14:56 2022 +0800
tree 439b63c404a5d73ad2834e89576ab0ed6d7d1703
parent 17d3518180ff6906fc7d105b984d682e7858b418

[FP4S-24]:Dynamic SIM Detection FLOW

&&&%%%comment:[FP4S-24]:Dynamic SIM Detection FLOW
&&&%%%bug number:[FP4S-24]
&&&%%%product name:sm7225_s_fp4_qssi_dev
&&&%%%root cause:coding
&&&%%%Bug category:T2M
&&&%%%Module_Impact:Telecom
&&&%%%Test_Suggestion:NA
&&&%%%Solution:NA
&&&%%%Test_Report:NA
&&&%%%VAL Can Test:YES

Change-Id: I61cac047f6d03a2491b371af17a538258b99f4c2

src/java/com/android/ims/ImsManager.java

diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index 9fefc22..398b5d2 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -778,9 +778,10 @@
             return true;
         }
 
-        return mContext.getResources().getBoolean(
+        // modify by T2M.dengxiangyu for FP4-61 2021-04-14
+        return /*mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_device_volte_available)
-                && getBooleanCarrierConfig(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL)
+                && */getBooleanCarrierConfig(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL)
                 && isGbaValid();
     }
 
@@ -948,10 +949,11 @@
         }
         //[Bug]-Modify-end by shaopan.tang
 
-        /*return mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_device_vt_available) &&
-                getBooleanCarrierConfig(CarrierConfigManager.KEY_CARRIER_VT_AVAILABLE_BOOL) &&
-                isGbaValid();*/
+        // modify by T2M.dengxiangyu for FP4-61 2021-04-14
+        //return /*mContext.getResources().getBoolean(
+                //com.android.internal.R.bool.config_device_vt_available) &&*/
+                //getBooleanCarrierConfig(CarrierConfigManager.KEY_CARRIER_VT_AVAILABLE_BOOL) &&
+                //isGbaValid();
     }
 
     /**
@@ -978,9 +980,15 @@
                 getSubId(), SubscriptionManager.VT_IMS_ENABLED,
                 SUB_PROPERTY_NOT_INITIALIZED);
 
-        // If it's never set, by default we return true.
-        return (setting == SUB_PROPERTY_NOT_INITIALIZED
-                || setting == ProvisioningManager.PROVISIONING_VALUE_ENABLED);
+        // add by T2M.dengxiangyu for FP4-61 2021-04-14 begin
+        // If it's never set, by default we return from carrier config
+        if (setting == SUB_PROPERTY_NOT_INITIALIZED) {
+            return getBooleanCarrierConfig(
+                    CarrierConfigManager.KEY_VT_IMS_ENABLED_BOOLEAN);
+        } else {
+            return setting == ProvisioningManager.PROVISIONING_VALUE_ENABLED;
+        }
+        // add by T2M.dengxiangyu for FP4-61 2021-04-14 end
     }
 
     /**
@@ -1533,8 +1541,9 @@
             return true;
         }
 
-        return mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_device_wfc_ims_available) &&
+        // modify by T2M.dengxiangyu for FP4-61 2021-04-14
+        return /*mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_device_wfc_ims_available) &&*/
                 getBooleanCarrierConfig(
                         CarrierConfigManager.KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL) &&
                 isGbaValid();