am eb9a8ab4: Merge "Remove volte_feature_disabled as carrier config handled it."...

* commit 'eb9a8ab415c8c9c0bf54104b2b6f858e83802ba2':
  Remove volte_feature_disabled as carrier config handled it.

diff --combined src/java/com/android/ims/ImsManager.java
index f12a6bcf45d75225af2d13fc2e2627891e62c934,9ef8942d950e34c346d89eaeaa2876039cd14387..3122b9ef3b50de5d9f9c45e03cddc6c0f94dd7b2
--- 1/src/java/com/android/ims/ImsManager.java
--- 2/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@@ -140,18 -140,6 +140,18 @@@ public class ImsManager 
       */
      public static final String EXTRA_USSD = "android:ussd";
  
 +    /**
 +     * Part of the ACTION_IMS_INCOMING_CALL intents.
 +     * A boolean value; Flag to indicate whether the call is an unknown
 +     * dialing call. Such calls are originated by sending commands (like
 +     * AT commands) directly to modem without Android involvement.
 +     * Even though they are not incoming calls, they are propagated
 +     * to Phone app using same ACTION_IMS_INCOMING_CALL intent.
 +     * Internal use only.
 +     * @hide
 +     */
 +    public static final String EXTRA_IS_UNKNOWN_CALL = "android:isUnknown";
 +
      private static final String TAG = "ImsManager";
      private static final boolean DBG = true;
  
@@@ -245,15 -233,10 +245,10 @@@
              return true;
          }
  
-         boolean disabledByGlobalSetting = android.provider.Settings.Global.getInt(
-                 context.getContentResolver(),
-                 android.provider.Settings.Global.VOLTE_FEATURE_DISABLED, 0) == 1;
- 
          return context.getResources().getBoolean(
                  com.android.internal.R.bool.config_device_volte_available)
                  && getBooleanCarrierConfig(context,
-                         CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL)
-                 && !disabledByGlobalSetting;
+                         CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL);
      }
  
      /*
@@@ -1084,15 -1067,6 +1079,15 @@@
                  mListener.onFeatureCapabilityChanged(serviceClass,
                          enabledFeatures, disabledFeatures);
              }
 +        }
 +
 +        @Override
 +        public void voiceMessageCountUpdate(int count) {
 +            log("voiceMessageCountUpdate :: count=" + count);
 +
 +            if (mListener != null) {
 +                mListener.onVoiceMessageCountChanged(count);
 +            }
          }
  
      }