am 330bdf85: am 65f5ce82: am e069ca2b: Merge "Revert "Hide CarrierPrivilege... (320ced06) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -29100,6 +29100,7 @@ package android.telephony {
		method public java.lang.String getSubscriberId();
		method public java.lang.String getVoiceMailAlphaTag();
		method public java.lang.String getVoiceMailNumber();
		method public int hasCarrierPrivileges();
		method public boolean hasIccCard();
		method public boolean iccCloseLogicalChannel(int);
		method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);
		@@ -29110,11 +29111,18 @@ package android.telephony {
		method public boolean isSmsCapable();
		method public void listen(android.telephony.PhoneStateListener, int);
		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_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_OFFHOOK = 2; // 0x2
		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_IN = 1; // 0x1
		field public static final int DATA_ACTIVITY_INOUT = 3; // 0x3

telecomm/java/android/telecom/PhoneAccount.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -283,6 +283,9 @@ public class PhoneAccount implements Parcelable {
		* 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
		* 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.
		*/

telephony/java/android/telephony/TelephonyManager.java

+6 −17

Original line number	Diff line number	Diff line
		@@ -1769,7 +1769,6 @@ public class TelephonyManager {
		*
		* @param alphaTag alpha-tagging of the dailing nubmer
		* @param number The dialing number
		* @hide
		*/
		public void setLine1NumberForDisplay(String alphaTag, String number) {
		setLine1NumberForDisplayForSubscriber(getDefaultSubscription(), alphaTag, number);
		@@ -2410,6 +2409,7 @@ public class TelephonyManager {
		*
		* <p>Requires Permission:
		* {@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.
		* @return an IccOpenLogicalChannelResponse object.
		@@ -2430,6 +2430,7 @@ public class TelephonyManager {
		*
		* <p>Requires Permission:
		* {@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
		* iccOpenLogicalChannel.
		@@ -2451,6 +2452,7 @@ public class TelephonyManager {
		*
		* <p>Requires Permission:
		* {@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
		* iccOpenLogicalChannel.
		@@ -2482,6 +2484,7 @@ public class TelephonyManager {
		*
		* <p>Requires Permission:
		* {@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 instruction Instruction of the APDU command.
		@@ -2509,6 +2512,7 @@ public class TelephonyManager {
		*
		* <p>Requires Permission:
		* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
		* Or the calling app has carrier privileges. @see #hasCarrierPrivileges
		*
		* @param fileID
		* @param command
		@@ -2534,6 +2538,7 @@ public class TelephonyManager {
		*
		* <p>Requires Permission:
		* {@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
		* format starting with command tag. See TS 102 223 for
		@@ -2998,7 +3003,6 @@ public class TelephonyManager {
		* Or the calling app has carrier privileges. @see #hasCarrierPrivileges
		*
		* @return true on success; false on any failure.
		* @hide
		*/
		public boolean setGlobalPreferredNetworkType() {
		return setPreferredNetworkType(RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
		@@ -3006,23 +3010,10 @@ public class TelephonyManager {

		/**
		* Values used to return status for hasCarrierPrivileges call.
		* @hide
		*/
		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;
		/**
		* Values used to return status for hasCarrierPrivileges call.
		* @hide
		*/
		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;

		/**
		@@ -3039,7 +3030,6 @@ public class TelephonyManager {
		* 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
		* rules (or if there are no rules).
		* @hide
		*/
		public int hasCarrierPrivileges() {
		try {
		@@ -3066,7 +3056,6 @@ public class TelephonyManager {
		*
		* @param brand The brand name to display/set.
		* @return true if the operation was executed correctly.
		* @hide
		*/
		public boolean setOperatorBrandOverride(String brand) {
		try {