Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix ImsMmTelManager API in accordance with the council"

Browse Source
This commit is contained in:
Brad Ebinger
2019-03-01 17:21:17 +00:00
committed by Gerrit Code Review
parent 948d11ffa6 66cee391c3
commit ea5bb6cd3b
3 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/system-current.txt
View File

@@ -6926,14 +6926,14 @@ package android.telephony.ims {
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isVtSettingEnabled(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isVtSettingEnabled();
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerImsRegistrationCallback(java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsMmTelManager.RegistrationCallback) throws android.telephony.ims.ImsException; method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerImsRegistrationCallback(java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsMmTelManager.RegistrationCallback) throws android.telephony.ims.ImsException;
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerMmTelCapabilityCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsMmTelManager.CapabilityCallback) throws android.telephony.ims.ImsException; method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerMmTelCapabilityCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsMmTelManager.CapabilityCallback) throws android.telephony.ims.ImsException;
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setAdvancedCallingSetting(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setAdvancedCallingSettingEnabled(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setRttCapabilitySetting(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setRttCapabilitySetting(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiModeSetting(int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiModeSetting(int);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiNonPersistent(boolean, int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiNonPersistent(boolean, int);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiRoamingModeSetting(int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiRoamingModeSetting(int);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiRoamingSetting(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiRoamingSettingEnabled(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiSetting(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiSettingEnabled(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVtSetting(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVtSettingEnabled(boolean);
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterImsRegistrationCallback(@NonNull android.telephony.ims.ImsMmTelManager.RegistrationCallback); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterImsRegistrationCallback(@NonNull android.telephony.ims.ImsMmTelManager.RegistrationCallback);
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterMmTelCapabilityCallback(@NonNull android.telephony.ims.ImsMmTelManager.CapabilityCallback); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterMmTelCapabilityCallback(@NonNull android.telephony.ims.ImsMmTelManager.CapabilityCallback);
field public static final int WIFI_MODE_CELLULAR_PREFERRED = 1; // 0x1 field public static final int WIFI_MODE_CELLULAR_PREFERRED = 1; // 0x1
@@ -6948,10 +6948,10 @@ package android.telephony.ims {
public static class ImsMmTelManager.RegistrationCallback { public static class ImsMmTelManager.RegistrationCallback {
ctor public ImsMmTelManager.RegistrationCallback(); ctor public ImsMmTelManager.RegistrationCallback();
method public void onDeregistered(android.telephony.ims.ImsReasonInfo);
method public void onRegistered(int); method public void onRegistered(int);
method public void onRegistering(int); method public void onRegistering(int);
method public void onTechnologyChangeFailed(int, android.telephony.ims.ImsReasonInfo); method public void onTechnologyChangeFailed(int, android.telephony.ims.ImsReasonInfo);
method public void onUnregistered(android.telephony.ims.ImsReasonInfo);
} }
public final class ImsReasonInfo implements android.os.Parcelable { public final class ImsReasonInfo implements android.os.Parcelable {

34
telephony/java/android/telephony/ims/ImsMmTelManager.java
View File

@@ -139,7 +139,7 @@ public class ImsMmTelManager {
if (mLocalCallback == null) return; if (mLocalCallback == null) return;
Binder.withCleanCallingIdentity(() -> Binder.withCleanCallingIdentity(() ->
mExecutor.execute(() -> mLocalCallback.onDeregistered(info))); mExecutor.execute(() -> mLocalCallback.onUnregistered(info)));
} }
@Override @Override
@@ -199,7 +199,7 @@ public class ImsMmTelManager {
* *
* @param info the {@link ImsReasonInfo} associated with why registration was disconnected. * @param info the {@link ImsReasonInfo} associated with why registration was disconnected.
*/ */
public void onDeregistered(ImsReasonInfo info) { public void onUnregistered(ImsReasonInfo info) {
} }
/** /**
@@ -485,7 +485,7 @@ public class ImsMmTelManager {
* @see android.telephony.CarrierConfigManager#KEY_HIDE_ENHANCED_4G_LTE_BOOL * @see android.telephony.CarrierConfigManager#KEY_HIDE_ENHANCED_4G_LTE_BOOL
* @see android.telephony.CarrierConfigManager#KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL * @see android.telephony.CarrierConfigManager#KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL
* @see android.telephony.CarrierConfigManager#KEY_CARRIER_VOLTE_AVAILABLE_BOOL * @see android.telephony.CarrierConfigManager#KEY_CARRIER_VOLTE_AVAILABLE_BOOL
* @see #setAdvancedCallingSetting(boolean) * @see #setAdvancedCallingSettingEnabled(boolean)
* @return true if the user's setting for advanced calling is enabled, false otherwise. * @return true if the user's setting for advanced calling is enabled, false otherwise.
*/ */
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
@@ -519,9 +519,9 @@ public class ImsMmTelManager {
* @see #isAdvancedCallingSettingEnabled() * @see #isAdvancedCallingSettingEnabled()
*/ */
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
public void setAdvancedCallingSetting(boolean isEnabled) { public void setAdvancedCallingSettingEnabled(boolean isEnabled) {
try { try {
getITelephony().setAdvancedCallingSetting(mSubId, isEnabled); getITelephony().setAdvancedCallingSettingEnabled(mSubId, isEnabled);
return; return;
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowAsRuntimeException(); throw e.rethrowAsRuntimeException();
@@ -589,7 +589,7 @@ public class ImsMmTelManager {
/** /**
* The user's setting for whether or not they have enabled the "Video Calling" setting. * The user's setting for whether or not they have enabled the "Video Calling" setting.
* @return true if the user’s “Video Calling” setting is currently enabled. * @return true if the user’s “Video Calling” setting is currently enabled.
* @see #setVtSetting(boolean) * @see #setVtSettingEnabled(boolean)
*/ */
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public boolean isVtSettingEnabled() { public boolean isVtSettingEnabled() {
@@ -605,9 +605,9 @@ public class ImsMmTelManager {
* @see #isVtSettingEnabled() * @see #isVtSettingEnabled()
*/ */
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
public void setVtSetting(boolean isEnabled) { public void setVtSettingEnabled(boolean isEnabled) {
try { try {
getITelephony().setVtSetting(mSubId, isEnabled); getITelephony().setVtSettingEnabled(mSubId, isEnabled);
return; return;
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowAsRuntimeException(); throw e.rethrowAsRuntimeException();
@@ -616,7 +616,7 @@ public class ImsMmTelManager {
/** /**
* @return true if the user's setting for Voice over WiFi is enabled and false if it is not. * @return true if the user's setting for Voice over WiFi is enabled and false if it is not.
* @see #setVoWiFiSetting(boolean) * @see #setVoWiFiSettingEnabled(boolean)
*/ */
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public boolean isVoWiFiSettingEnabled() { public boolean isVoWiFiSettingEnabled() {
@@ -633,9 +633,9 @@ public class ImsMmTelManager {
* @see #isVoWiFiSettingEnabled() * @see #isVoWiFiSettingEnabled()
*/ */
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
public void setVoWiFiSetting(boolean isEnabled) { public void setVoWiFiSettingEnabled(boolean isEnabled) {
try { try {
getITelephony().setVoWiFiSetting(mSubId, isEnabled); getITelephony().setVoWiFiSettingEnabled(mSubId, isEnabled);
return; return;
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowAsRuntimeException(); throw e.rethrowAsRuntimeException();
@@ -645,7 +645,7 @@ public class ImsMmTelManager {
/** /**
* @return true if the user's setting for Voice over WiFi while roaming is enabled, false * @return true if the user's setting for Voice over WiFi while roaming is enabled, false
* if disabled. * if disabled.
* @see #setVoWiFiRoamingSetting(boolean) * @see #setVoWiFiRoamingSettingEnabled(boolean)
*/ */
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public boolean isVoWiFiRoamingSettingEnabled() { public boolean isVoWiFiRoamingSettingEnabled() {
@@ -663,9 +663,9 @@ public class ImsMmTelManager {
* @see #isVoWiFiRoamingSettingEnabled() * @see #isVoWiFiRoamingSettingEnabled()
*/ */
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
public void setVoWiFiRoamingSetting(boolean isEnabled) { public void setVoWiFiRoamingSettingEnabled(boolean isEnabled) {
try { try {
getITelephony().setVoWiFiRoamingSetting(mSubId, isEnabled); getITelephony().setVoWiFiRoamingSettingEnabled(mSubId, isEnabled);
return; return;
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowAsRuntimeException(); throw e.rethrowAsRuntimeException();
@@ -682,7 +682,7 @@ public class ImsMmTelManager {
* - {@link #WIFI_MODE_WIFI_ONLY} * - {@link #WIFI_MODE_WIFI_ONLY}
* - {@link #WIFI_MODE_CELLULAR_PREFERRED} * - {@link #WIFI_MODE_CELLULAR_PREFERRED}
* - {@link #WIFI_MODE_WIFI_PREFERRED} * - {@link #WIFI_MODE_WIFI_PREFERRED}
* @see #setVoWiFiSetting(boolean) * @see #setVoWiFiSettingEnabled(boolean)
*/ */
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
public void setVoWiFiNonPersistent(boolean isCapable, int mode) { public void setVoWiFiNonPersistent(boolean isCapable, int mode) {
@@ -700,7 +700,7 @@ public class ImsMmTelManager {
* - {@link #WIFI_MODE_WIFI_ONLY} * - {@link #WIFI_MODE_WIFI_ONLY}
* - {@link #WIFI_MODE_CELLULAR_PREFERRED} * - {@link #WIFI_MODE_CELLULAR_PREFERRED}
* - {@link #WIFI_MODE_WIFI_PREFERRED} * - {@link #WIFI_MODE_WIFI_PREFERRED}
* @see #setVoWiFiSetting(boolean) * @see #setVoWiFiSettingEnabled(boolean)
*/ */
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public @WiFiCallingMode int getVoWiFiModeSetting() { public @WiFiCallingMode int getVoWiFiModeSetting() {
@@ -739,7 +739,7 @@ public class ImsMmTelManager {
* - {@link #WIFI_MODE_WIFI_ONLY} * - {@link #WIFI_MODE_WIFI_ONLY}
* - {@link #WIFI_MODE_CELLULAR_PREFERRED} * - {@link #WIFI_MODE_CELLULAR_PREFERRED}
* - {@link #WIFI_MODE_WIFI_PREFERRED} * - {@link #WIFI_MODE_WIFI_PREFERRED}
* @see #setVoWiFiRoamingSetting(boolean) * @see #setVoWiFiRoamingSettingEnabled(boolean)
*/ */
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public @WiFiCallingMode int getVoWiFiRoamingModeSetting() { public @WiFiCallingMode int getVoWiFiRoamingModeSetting() {

8
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -1671,7 +1671,7 @@ interface ITelephony {
/** /**
* Modify the user's setting for whether or not 4G LTE is enabled. * Modify the user's setting for whether or not 4G LTE is enabled.
*/ */
void setAdvancedCallingSetting(int subId, boolean isEnabled); void setAdvancedCallingSettingEnabled(int subId, boolean isEnabled);
/** /**
* return true if the user's setting for VT is enabled for the subscription. * return true if the user's setting for VT is enabled for the subscription.
@@ -1681,7 +1681,7 @@ interface ITelephony {
/** /**
* Modify the user's setting for whether or not VT is available for the subscrption specified. * Modify the user's setting for whether or not VT is available for the subscrption specified.
*/ */
void setVtSetting(int subId, boolean isEnabled); void setVtSettingEnabled(int subId, boolean isEnabled);
/** /**
* return true if the user's setting for whether or not Voice over WiFi is currently enabled. * return true if the user's setting for whether or not Voice over WiFi is currently enabled.
@@ -1691,7 +1691,7 @@ interface ITelephony {
/** /**
* sets the user's setting for Voice over WiFi enabled state. * sets the user's setting for Voice over WiFi enabled state.
*/ */
void setVoWiFiSetting(int subId, boolean isEnabled); void setVoWiFiSettingEnabled(int subId, boolean isEnabled);
/** /**
* return true if the user's setting for Voice over WiFi while roaming is enabled. * return true if the user's setting for Voice over WiFi while roaming is enabled.
@@ -1702,7 +1702,7 @@ interface ITelephony {
* Sets the user's preference for whether or not Voice over WiFi is enabled for the current * Sets the user's preference for whether or not Voice over WiFi is enabled for the current
* subscription while roaming. * subscription while roaming.
*/ */
void setVoWiFiRoamingSetting(int subId, boolean isEnabled); void setVoWiFiRoamingSettingEnabled(int subId, boolean isEnabled);
/** /**
* Set the Voice over WiFi enabled state, but do not persist the setting. * Set the Voice over WiFi enabled state, but do not persist the setting.