Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a3518cc authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge "Expose ImsMmTelManager APIs as SystemApi"

parents 4492ec57 fd88080d

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -42097,6 +42097,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL = "editable_voicemail_number_bool";

    field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL = "editable_voicemail_number_setting_bool";

    field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool";

    field public static final java.lang.String KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL = "enhanced_4g_lte_on_by_default_bool";

    field public static final java.lang.String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool";

    field public static final java.lang.String KEY_GSM_DTMF_TONE_DELAY_INT = "gsm_dtmf_tone_delay_int";

    field public static final java.lang.String KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY = "gsm_nonroaming_networks_string_array";

api/system-current.txt

+39 −0
Original line number Diff line number Diff line
@@ -5849,6 +5849,45 @@ package android.telephony.ims { 
    field public static final android.os.Parcelable.Creator<android.telephony.ims.ImsExternalCallState> CREATOR;

  }



  public class ImsMmTelManager {

    method public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(android.content.Context, int);

    method public int getVoWiFiModeSetting();

    method public boolean isAdvancedCallingSettingEnabled();

    method public boolean isAvailable(int, int);

    method public boolean isCapable(int, int);

    method public boolean isVoWiFiRoamingSettingEnabled();

    method public boolean isVoWiFiSettingEnabled();

    method public boolean isVtSettingEnabled();

    method public void registerImsRegistrationCallback(java.util.concurrent.Executor, android.telephony.ims.ImsMmTelManager.RegistrationCallback);

    method public void registerMmTelCapabilityCallback(java.util.concurrent.Executor, android.telephony.ims.ImsMmTelManager.CapabilityCallback);

    method public void setAdvancedCallingSetting(boolean);

    method public void setRttCapabilitySetting(boolean);

    method public void setVoWiFiModeSetting(int);

    method public void setVoWiFiNonPersistent(boolean, int);

    method public void setVoWiFiRoamingModeSetting(int);

    method public void setVoWiFiRoamingSetting(boolean);

    method public void setVoWiFiSetting(boolean);

    method public void setVtSetting(boolean);

    method public void unregisterImsRegistrationCallback(android.telephony.ims.ImsMmTelManager.RegistrationCallback);

    method public void unregisterMmTelCapabilityCallback(android.telephony.ims.ImsMmTelManager.CapabilityCallback);

    field public static final int WIFI_MODE_CELLULAR_PREFERRED = 1; // 0x1

    field public static final int WIFI_MODE_WIFI_ONLY = 0; // 0x0

    field public static final int WIFI_MODE_WIFI_PREFERRED = 2; // 0x2

  }



  public static class ImsMmTelManager.CapabilityCallback {

    ctor public ImsMmTelManager.CapabilityCallback();

    method public void onCapabilitiesStatusChanged(android.telephony.ims.feature.MmTelFeature.MmTelCapabilities);

  }



  public static class ImsMmTelManager.RegistrationCallback {

    ctor public ImsMmTelManager.RegistrationCallback();

    method public void onDeregistered(android.telephony.ims.ImsReasonInfo);

    method public void onRegistered(int);

    method public void onRegistering(int);

    method public void onTechnologyChangeFailed(int, android.telephony.ims.ImsReasonInfo);

  }



  public final class ImsReasonInfo implements android.os.Parcelable {

    ctor public ImsReasonInfo(int, int, java.lang.String);

    method public int describeContents();

telephony/java/android/telephony/CarrierConfigManager.java

+3 −3
Original line number Diff line number Diff line
@@ -1023,9 +1023,9 @@ public class CarrierConfigManager { 
    public static final String KEY_HIDE_ENHANCED_4G_LTE_BOOL = "hide_enhanced_4g_lte_bool";



    /**

     * Default Enhanced 4G LTE mode enabled. When this is {@code true}, Enhanced 4G LTE mode by

     * default is on, otherwise if {@code false}, Enhanced 4G LTE mode by default is off.

     * @hide

     * Sets the default state for the "Enhanced 4G LTE" or "Advanced Calling" mode toggle set by the

     * user. When this is {@code true}, this mode by default is on, otherwise if {@code false},

     * this mode by default is off.

     */

    public static final String KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL =

            "enhanced_4g_lte_on_by_default_bool";

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -7675,7 +7675,7 @@ public class TelephonyManager { 
        try {

            return getITelephony().isAvailable(getSubId(),

                    MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE,

                    ImsRegistrationImplBase.REGISTRATION_TECH_LTE, getOpPackageName());

                    ImsRegistrationImplBase.REGISTRATION_TECH_LTE);

        } catch (RemoteException | NullPointerException ex) {

            return false;

        }

telephony/java/android/telephony/ims/ImsMmTelManager.java

+127 −97

File changed.

Preview size limit exceeded, changes collapsed.