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

Merge "Add APIs to get/set if usage of multiple SIMs is restricted."

Browse Source 
am: 59133875e7

Change-Id: Ie9c2a17b65f21862502056957ff5603b62f7d4dd
This commit is contained in:
Michele Berionne
2019-01-29 22:31:18 -08:00
committed by android-build-merger
parent d3e0862b2c 59133875e7
commit e01966e89b
3 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -6316,6 +6316,7 @@ package android.telephony {
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isCurrentPotentialEmergencyNumber(@NonNull String);
method public boolean isDataConnectivityPossible();
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isMultisimCarrierRestricted();
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRadioOn();
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging();
@@ -6332,6 +6333,7 @@ package android.telephony {
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int);
method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultisimCarrierRestriction(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadioPower(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSimPowerState(int);

48
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -9981,4 +9981,52 @@ public class TelephonyManager {
}
return ret;
}
/**
* Indicate if the user is allowed to use multiple SIM cards at the same time to register
* on the network (e.g. Dual Standby or Dual Active) when the device supports it, or if the
* usage is restricted. This API is used to prevent usage of multiple SIM card, based on
* policies of the carrier.
* <p>Note: the API does not prevent access to the SIM cards for operations that don't require
* access to the network.
*
* @param isMultisimCarrierRestricted true if usage of multiple SIMs is restricted, false
* otherwise.
*
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void setMultisimCarrierRestriction(boolean isMultisimCarrierRestricted) {
try {
ITelephony service = getITelephony();
if (service != null) {
service.setMultisimCarrierRestriction(isMultisimCarrierRestricted);
}
} catch (RemoteException e) {
Log.e(TAG, "setMultisimCarrierRestriction RemoteException", e);
}
}
/**
* Returns if the usage of multiple SIM cards at the same time to register on the network
* (e.g. Dual Standby or Dual Active) is restricted.
*
* @return true if usage of multiple SIMs is restricted, false otherwise.
*
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public boolean isMultisimCarrierRestricted() {
try {
ITelephony service = getITelephony();
if (service != null) {
return service.isMultisimCarrierRestricted();
}
} catch (RemoteException e) {
Log.e(TAG, "isMultisimCarrierRestricted RemoteException", e);
}
return true;
}
}

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

@@ -1817,4 +1817,16 @@ interface ITelephony {
* Enable or disable a logical modem stack associated with the slotIndex.
*/
boolean enableModemForSlot(int slotIndex, boolean enable);
/**
* Indicate if the enablement of multi SIM functionality is restricted.
* @hide
*/
void setMultisimCarrierRestriction(boolean isMultisimCarrierRestricted);
/**
* Returns if the usage of multiple SIM cards at the same time is restricted.
* @hide
*/
boolean isMultisimCarrierRestricted();
}