am 8e61b503: am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev (05b1f42d) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −8

telecomm/java/android/telecom/PhoneAccount.java

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -283,9 +283,6 @@ public class PhoneAccount implements Parcelable {
	* The raw callback number used for this {@code PhoneAccount}, as distinct from		* The raw callback number used for this {@code PhoneAccount}, as distinct from
	* {@link #getAddress()}. For the majority of {@code PhoneAccount}s this should be registered		* {@link #getAddress()}. For the majority of {@code PhoneAccount}s this should be registered
	* as {@code null}. It is used by the system for SIM-based {@code PhoneAccount} registration		* as {@code null}. It is used by the system for SIM-based {@code PhoneAccount} registration
	* where {@link android.telephony.TelephonyManager#setLine1NumberForDisplay(String, String)}
	* has been used to alter the callback number.
	* <p>
	*		*
	* @return The subscription number, suitable for display to the user.		* @return The subscription number, suitable for display to the user.
	*/		*/

telephony/java/android/telephony/TelephonyManager.java

+17 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1769,6 +1769,7 @@ public class TelephonyManager {
	*		*
	* @param alphaTag alpha-tagging of the dailing nubmer		* @param alphaTag alpha-tagging of the dailing nubmer
	* @param number The dialing number		* @param number The dialing number
			* @hide
	*/		*/
	public void setLine1NumberForDisplay(String alphaTag, String number) {		public void setLine1NumberForDisplay(String alphaTag, String number) {
	setLine1NumberForDisplayForSubscriber(getDefaultSubscription(), alphaTag, number);		setLine1NumberForDisplayForSubscriber(getDefaultSubscription(), alphaTag, number);
	@@ -2413,7 +2414,6 @@ public class TelephonyManager {
	*		*
	* <p>Requires Permission:		* <p>Requires Permission:
	* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}		* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
	* Or the calling app has carrier privileges. @see #hasCarrierPrivileges
	*		*
	* @param AID Application id. See ETSI 102.221 and 101.220.		* @param AID Application id. See ETSI 102.221 and 101.220.
	* @return an IccOpenLogicalChannelResponse object.		* @return an IccOpenLogicalChannelResponse object.
	@@ -2434,7 +2434,6 @@ public class TelephonyManager {
	*		*
	* <p>Requires Permission:		* <p>Requires Permission:
	* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}		* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
	* Or the calling app has carrier privileges. @see #hasCarrierPrivileges
	*		*
	* @param channel is the channel id to be closed as retruned by a successful		* @param channel is the channel id to be closed as retruned by a successful
	* iccOpenLogicalChannel.		* iccOpenLogicalChannel.
	@@ -2456,7 +2455,6 @@ public class TelephonyManager {
	*		*
	* <p>Requires Permission:		* <p>Requires Permission:
	* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}		* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
	* Or the calling app has carrier privileges. @see #hasCarrierPrivileges
	*		*
	* @param channel is the channel id to be closed as returned by a successful		* @param channel is the channel id to be closed as returned by a successful
	* iccOpenLogicalChannel.		* iccOpenLogicalChannel.
	@@ -2488,7 +2486,6 @@ public class TelephonyManager {
	*		*
	* <p>Requires Permission:		* <p>Requires Permission:
	* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}		* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
	* Or the calling app has carrier privileges. @see #hasCarrierPrivileges
	*		*
	* @param cla Class of the APDU command.		* @param cla Class of the APDU command.
	* @param instruction Instruction of the APDU command.		* @param instruction Instruction of the APDU command.
	@@ -2516,7 +2513,6 @@ public class TelephonyManager {
	*		*
	* <p>Requires Permission:		* <p>Requires Permission:
	* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}		* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
	* Or the calling app has carrier privileges. @see #hasCarrierPrivileges
	*		*
	* @param fileID		* @param fileID
	* @param command		* @param command
	@@ -2542,7 +2538,6 @@ public class TelephonyManager {
	*		*
	* <p>Requires Permission:		* <p>Requires Permission:
	* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}		* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
	* Or the calling app has carrier privileges. @see #hasCarrierPrivileges
	*		*
	* @param content String containing SAT/USAT response in hexadecimal		* @param content String containing SAT/USAT response in hexadecimal
	* format starting with command tag. See TS 102 223 for		* format starting with command tag. See TS 102 223 for
	@@ -3007,6 +3002,7 @@ public class TelephonyManager {
	* Or the calling app has carrier privileges. @see #hasCarrierPrivileges		* Or the calling app has carrier privileges. @see #hasCarrierPrivileges
	*		*
	* @return true on success; false on any failure.		* @return true on success; false on any failure.
			* @hide
	*/		*/
	public boolean setGlobalPreferredNetworkType() {		public boolean setGlobalPreferredNetworkType() {
	return setPreferredNetworkType(RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);		return setPreferredNetworkType(RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
	@@ -3014,10 +3010,23 @@ public class TelephonyManager {

	/**		/**
	* Values used to return status for hasCarrierPrivileges call.		* Values used to return status for hasCarrierPrivileges call.
			* @hide
	*/		*/
	public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1;		public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1;
			/**
			* Values used to return status for hasCarrierPrivileges call.
			* @hide
			*/
	public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0;		public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0;
			/**
			* Values used to return status for hasCarrierPrivileges call.
			* @hide
			*/
	public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1;		public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1;
			/**
			* Values used to return status for hasCarrierPrivileges call.
			* @hide
			*/
	public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2;		public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2;

	/**		/**
	@@ -3034,6 +3043,7 @@ public class TelephonyManager {
	* CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED if the carrier rules are not loaded.		* CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED if the carrier rules are not loaded.
	* CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES if there was an error loading carrier		* CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES if there was an error loading carrier
	* rules (or if there are no rules).		* rules (or if there are no rules).
			* @hide
	*/		*/
	public int hasCarrierPrivileges() {		public int hasCarrierPrivileges() {
	try {		try {
	@@ -3060,6 +3070,7 @@ public class TelephonyManager {
	*		*
	* @param brand The brand name to display/set.		* @param brand The brand name to display/set.
	* @return true if the operation was executed correctly.		* @return true if the operation was executed correctly.
			* @hide
	*/		*/
	public boolean setOperatorBrandOverride(String brand) {		public boolean setOperatorBrandOverride(String brand) {
	try {		try {

Original line number	Original line	Diff line number	Diff line
	@@ -28870,7 +28870,6 @@ package android.telephony {
	method public java.lang.String getSubscriberId();		method public java.lang.String getSubscriberId();
	method public java.lang.String getVoiceMailAlphaTag();		method public java.lang.String getVoiceMailAlphaTag();
	method public java.lang.String getVoiceMailNumber();		method public java.lang.String getVoiceMailNumber();
	method public int hasCarrierPrivileges();
	method public boolean hasIccCard();		method public boolean hasIccCard();
	method public boolean iccCloseLogicalChannel(int);		method public boolean iccCloseLogicalChannel(int);
	method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);		method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);
	@@ -28881,18 +28880,11 @@ package android.telephony {
	method public boolean isSmsCapable();		method public boolean isSmsCapable();
	method public void listen(android.telephony.PhoneStateListener, int);		method public void listen(android.telephony.PhoneStateListener, int);
	method public java.lang.String sendEnvelopeWithStatus(java.lang.String);		method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
	method public boolean setGlobalPreferredNetworkType();
	method public void setLine1NumberForDisplay(java.lang.String, java.lang.String);
	method public boolean setOperatorBrandOverride(java.lang.String);
	field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";		field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";
	field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";		field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";
	field public static final int CALL_STATE_IDLE = 0; // 0x0		field public static final int CALL_STATE_IDLE = 0; // 0x0
	field public static final int CALL_STATE_OFFHOOK = 2; // 0x2		field public static final int CALL_STATE_OFFHOOK = 2; // 0x2
	field public static final int CALL_STATE_RINGING = 1; // 0x1		field public static final int CALL_STATE_RINGING = 1; // 0x1
	field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe
	field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1
	field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0
	field public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1; // 0xffffffff
	field public static final int DATA_ACTIVITY_DORMANT = 4; // 0x4		field public static final int DATA_ACTIVITY_DORMANT = 4; // 0x4
	field public static final int DATA_ACTIVITY_IN = 1; // 0x1		field public static final int DATA_ACTIVITY_IN = 1; // 0x1
	field public static final int DATA_ACTIVITY_INOUT = 3; // 0x3		field public static final int DATA_ACTIVITY_INOUT = 3; // 0x3