diff options
Diffstat (limited to 'telephony/java')
5 files changed, 36 insertions, 93 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 0246a2d..b06d44c 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3453,75 +3453,6 @@ public class TelephonyManager { } /** - * Set whether Android should display a simplified Mobile Network Settings UI - * for the current ICCID. - * <p> - * Requires Permission: - * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} - * Or the calling app has carrier privileges. @see #hasCarrierPrivileges - * - * @param enable true means enabling the simplified UI. - * @hide - */ - public void enableSimplifiedNetworkSettings(boolean enable) { - enableSimplifiedNetworkSettingsForSubscriber(getDefaultSubscription(), enable); - } - - /** - * Set whether Android should display a simplified Mobile Network Settings UI - * for the current ICCID. - * <p> - * Requires Permission: - * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} - * Or the calling app has carrier privileges. @see #hasCarrierPrivileges - * - * @param subId for which the simplified UI should be enabled or disabled. - * @param enable true means enabling the simplified UI. - * @hide - */ - public void enableSimplifiedNetworkSettingsForSubscriber(int subId, boolean enable) { - try { - getITelephony().enableSimplifiedNetworkSettingsForSubscriber(subId, enable); - } catch (RemoteException ex) { - } catch (NullPointerException ex) { - } - } - - /** - * Get whether a simplified Mobile Network Settings UI is enabled for the - * current ICCID. - * <p> - * Requires Permission: - * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} - * - * @return true if the simplified UI is enabled. - * @hide - */ - public boolean getSimplifiedNetworkSettingsEnabled() { - return getSimplifiedNetworkSettingsEnabledForSubscriber(getDefaultSubscription()); - } - - /** - * Get whether a simplified Mobile Network Settings UI is enabled for the - * current ICCID. - * <p> - * Requires Permission: - * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} - * - * @param subId for which the simplified UI should be enabled or disabled. - * @return true if the simplified UI is enabled. - * @hide - */ - public boolean getSimplifiedNetworkSettingsEnabledForSubscriber(int subId) { - try { - return getITelephony().getSimplifiedNetworkSettingsEnabledForSubscriber(subId); - } catch (RemoteException ex) { - } catch (NullPointerException ex) { - } - return false; - } - - /** * Returns the result and response from RIL for oem request * * @param oemReq the data is sent to ril. diff --git a/telephony/java/com/android/ims/ImsCallProfile.java b/telephony/java/com/android/ims/ImsCallProfile.java index 8b7901c..9de938a 100644 --- a/telephony/java/com/android/ims/ImsCallProfile.java +++ b/telephony/java/com/android/ims/ImsCallProfile.java @@ -114,6 +114,10 @@ public class ImsCallProfile implements Parcelable { public static final String EXTRA_CALL_MODE_CHANGEABLE = "call_mode_changeable"; public static final String EXTRA_CONFERENCE_AVAIL = "conference_avail"; + // Extra string for internal use only. OEMs should not use + // this for packing extras. + public static final String EXTRA_OEM_EXTRAS = "OemCallExtras"; + /** * Integer extra properties * oir : Rule for originating identity (number) presentation, MO/MT. @@ -151,6 +155,18 @@ public class ImsCallProfile implements Parcelable { public static final int DIALSTRING_USSD = 2; /** + * Values for causes that restrict call types + */ + // Default cause not restricted at peer and HD is supported + public static final int CALL_RESTRICT_CAUSE_NONE = 0; + // Service not supported by RAT at peer + public static final int CALL_RESTRICT_CAUSE_RAT = 1; + // Service Disabled at peer + public static final int CALL_RESTRICT_CAUSE_DISABLED = 2; + // HD is not supported + public static final int CALL_RESTRICT_CAUSE_HD = 3; + + /** * String extra properties * oi : Originating identity (number), MT only * cna : Calling name @@ -164,11 +180,10 @@ public class ImsCallProfile implements Parcelable { public int mServiceType; public int mCallType; + public int mRestrictCause = CALL_RESTRICT_CAUSE_NONE; public Bundle mCallExtras; public ImsStreamMediaProfile mMediaProfile; - - public ImsCallProfile(Parcel in) { readFromParcel(in); } diff --git a/telephony/java/com/android/ims/ImsStreamMediaProfile.java b/telephony/java/com/android/ims/ImsStreamMediaProfile.java index 003499c..359b270 100644 --- a/telephony/java/com/android/ims/ImsStreamMediaProfile.java +++ b/telephony/java/com/android/ims/ImsStreamMediaProfile.java @@ -41,10 +41,18 @@ public class ImsStreamMediaProfile implements Parcelable { * Audio information */ public static final int AUDIO_QUALITY_NONE = 0; - public static final int AUDIO_QUALITY_AMR = (1 << 0); - public static final int AUDIO_QUALITY_AMR_WB = (1 << 1); - - /** + public static final int AUDIO_QUALITY_AMR = 1; + public static final int AUDIO_QUALITY_AMR_WB = 2; + public static final int AUDIO_QUALITY_QCELP13K = 3; + public static final int AUDIO_QUALITY_EVRC = 4; + public static final int AUDIO_QUALITY_EVRC_B = 5; + public static final int AUDIO_QUALITY_EVRC_WB = 6; + public static final int AUDIO_QUALITY_EVRC_NW = 7; + public static final int AUDIO_QUALITY_GSM_EFR = 8; + public static final int AUDIO_QUALITY_GSM_FR = 9; + public static final int AUDIO_QUALITY_GSM_HR = 10; + + /** * Video information */ public static final int VIDEO_QUALITY_NONE = 0; diff --git a/telephony/java/com/android/ims/internal/IImsCallSession.aidl b/telephony/java/com/android/ims/internal/IImsCallSession.aidl index 16b0cd5..d1946e3 100644 --- a/telephony/java/com/android/ims/internal/IImsCallSession.aidl +++ b/telephony/java/com/android/ims/internal/IImsCallSession.aidl @@ -55,6 +55,13 @@ interface IImsCallSession { ImsCallProfile getLocalCallProfile(); /** + * Gets the remote call profile that this session is associated with + * + * @return the remote call profile that this session is associated with + */ + ImsCallProfile getRemoteCallProfile(); + + /** * Gets the value associated with the specified property of this session. * * @return the string value associated with the specified property diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 13f0e3f..c50261d 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -727,24 +727,6 @@ interface ITelephony { List<String> getCarrierPackageNamesForIntent(in Intent intent); /** - * Set whether Android should display a simplified Mobile Network Settings UI - * for the current ICCID. - * - * @param subId for which the simplified UI should be enabled or disabled. - * @param enable true means enabling the simplified UI. - */ - void enableSimplifiedNetworkSettingsForSubscriber(int subId, boolean enable); - - /** - * Get whether a simplified Mobile Network Settings UI is enabled for the - * current ICCID. - * - * @param subId for which the simplified UI should be enabled or disabled. - * @return true if the simplified UI is enabled. - */ - boolean getSimplifiedNetworkSettingsEnabledForSubscriber(int subId); - - /** * Set the line 1 phone number string and its alphatag for the current ICCID * for display purpose only, for example, displayed in Phone Status. It won't * change the actual MSISDN/MDN. To unset alphatag or number, pass in a null |