ImsProvisioningController returns provisioned when provisoning has not completed

Delete code that access deprecated carrier config key, and hand over to
ImsProvisioningController

Bug: 230794289
Test: atest ImsManagerTest, ImsServiceTest
Test: manual with TMO, ATT SIM
1. add carrier config carrier_volte_provisioning_required_bool as true
2. device reboot
3. check IMS registration and imsprovisioningstatus_X.xml file is created by ImsProvisioningLoader
Change-Id: I289e0787ab90957a5c5eb03b4bff9b0ee35160d6

1 files changed, 9 insertions, 29 deletions

diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index e212ee0b..257aef91 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -849,12 +849,7 @@ public class ImsManager implements FeatureUpdates {
      * Indicates whether VoLTE is provisioned on this slot.
      */
     public boolean isVolteProvisionedOnDevice() {
-        // check new carrier config first KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE
-        // if that returns false, check deprecated carrier config
-        // KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL
-        if (isMmTelProvisioningRequired(CAPABILITY_TYPE_VOICE, REGISTRATION_TECH_LTE) ||
-                getBooleanCarrierConfig(
-                        CarrierConfigManager.KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL)) {
+        if (isMmTelProvisioningRequired(CAPABILITY_TYPE_VOICE, REGISTRATION_TECH_LTE)) {
             return isVolteProvisioned();
         }
 
@@ -865,12 +860,7 @@ public class ImsManager implements FeatureUpdates {
      * Indicates whether EAB is provisioned on this slot.
      */
     public boolean isEabProvisionedOnDevice() {
-        // check new carrier config first KEY_RCS_REQUIRES_PROVISIONING_BUNDLE
-        // if that returns false, check deprecated carrier config
-        // KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL
-        if (isRcsProvisioningRequired(CAPABILITY_TYPE_PRESENCE_UCE, REGISTRATION_TECH_LTE) ||
-                getBooleanCarrierConfig(
-                        CarrierConfigManager.KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL)) {
+        if (isRcsProvisioningRequired(CAPABILITY_TYPE_PRESENCE_UCE, REGISTRATION_TECH_LTE)) {
             return isEabProvisioned();
         }
 
@@ -910,12 +900,7 @@ public class ImsManager implements FeatureUpdates {
             }
         }
 
-        // check new carrier config first KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE
-        // if that returns false, check deprecated carrier config
-        // KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL
-        if (isMmTelProvisioningRequired(CAPABILITY_TYPE_VOICE, REGISTRATION_TECH_IWLAN)
-                || getBooleanCarrierConfig(
-                        CarrierConfigManager.KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL)) {
+        if (isMmTelProvisioningRequired(CAPABILITY_TYPE_VOICE, REGISTRATION_TECH_IWLAN)) {
             return isWfcProvisioned();
         }
 
@@ -942,12 +927,7 @@ public class ImsManager implements FeatureUpdates {
      * Indicates whether VT is provisioned on slot.
      */
     public boolean isVtProvisionedOnDevice() {
-        // check new carrier config first KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE
-        // if that returns false, check deprecated carrier config
-        // KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL
-        if (isMmTelProvisioningRequired(CAPABILITY_TYPE_VIDEO, REGISTRATION_TECH_LTE) ||
-                getBooleanCarrierConfig(
-                        CarrierConfigManager.KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL)) {
+        if (isMmTelProvisioningRequired(CAPABILITY_TYPE_VIDEO, REGISTRATION_TECH_LTE)) {
             return isVtProvisioned();
         }
 
@@ -1653,7 +1633,7 @@ public class ImsManager implements FeatureUpdates {
         }
 
         try {
-            return  iTelephony.getImsProvisioningStatusForCapability(subId, capability, tech);
+            return iTelephony.getImsProvisioningStatusForCapability(subId, capability, tech);
         } catch (RemoteException e) {
             logw("getImsProvisionedBoolNoException: operation failed for capability=" + capability
                     + ". Exception:" + e.getMessage() + ". Returning false.");
@@ -1679,7 +1659,7 @@ public class ImsManager implements FeatureUpdates {
         }
 
         try {
-            return  iTelephony.getRcsProvisioningStatusForCapability(subId, capability, tech);
+            return iTelephony.getRcsProvisioningStatusForCapability(subId, capability, tech);
         } catch (RemoteException e) {
             logw("getRcsProvisionedBoolNoException: operation failed for capability=" + capability
                     + ". Exception:" + e.getMessage() + ". Returning false.");
@@ -3175,8 +3155,8 @@ public class ImsManager implements FeatureUpdates {
 
         boolean required = false;
         try {
-                required |= iTelephony.isProvisioningRequiredForCapability(subId, capability,
-                        tech);
+            required = iTelephony.isProvisioningRequiredForCapability(subId, capability,
+                    tech);
         } catch (RemoteException e) {
             logw("isMmTelProvisioningRequired couldn't reach telephony!");
         }
@@ -3200,7 +3180,7 @@ public class ImsManager implements FeatureUpdates {
 
         boolean required = false;
         try {
-            required |= iTelephony.isRcsProvisioningRequiredForCapability(subId, capability,
+            required = iTelephony.isRcsProvisioningRequiredForCapability(subId, capability,
                     tech);
         } catch (RemoteException e) {
             logw("isRcsProvisioningRequired couldn't reach telephony!");