Merge "Delete hidden API in Telephony.ServiceStateTable" (c3458b6b) · Commits · e / os / android_frameworks_base

core/java/android/provider/Telephony.java

+0 −188

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ import android.database.sqlite.SqliteWrapper;
		import android.net.Uri;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.Parcel;
		import android.telephony.CarrierConfigManager;
		import android.telephony.Rlog;
		import android.telephony.ServiceState;
		@@ -4558,32 +4557,6 @@ public final class Telephony {
		return CONTENT_URI.buildUpon().appendEncodedPath(String.valueOf(subscriptionId)).build();
		}

		/**
		* Used to insert a ServiceState into the ServiceStateProvider as a ContentValues instance.
		*
		* @param state the ServiceState to convert into ContentValues
		* @return the convertedContentValues instance
		* @hide
		*/
		public static ContentValues getContentValuesForServiceState(ServiceState state) {
		ContentValues values = new ContentValues();
		final Parcel p = Parcel.obtain();
		state.writeToParcel(p, 0);
		// Turn the parcel to byte array. Safe to do this because the content values were never
		// written into a persistent storage. ServiceStateProvider keeps values in the memory.
		values.put(SERVICE_STATE, p.marshall());
		return values;
		}

		/**
		* The current service state.
		*
		* This is the entire {@link ServiceState} object in byte array.
		*
		* @hide
		*/
		public static final String SERVICE_STATE = "service_state";

		/**
		* An integer value indicating the current voice service state.
		* <p>
		@@ -4595,53 +4568,6 @@ public final class Telephony {
		*/
		public static final String VOICE_REG_STATE = "voice_reg_state";

		/**
		* An integer value indicating the current data service state.
		* <p>
		* Valid values: {@link ServiceState#STATE_IN_SERVICE},
		* {@link ServiceState#STATE_OUT_OF_SERVICE}, {@link ServiceState#STATE_EMERGENCY_ONLY},
		* {@link ServiceState#STATE_POWER_OFF}.
		* <p>
		* This is the same as {@link ServiceState#getDataRegState()}.
		* @hide
		*/
		public static final String DATA_REG_STATE = "data_reg_state";

		/**
		* An integer value indicating the current voice roaming type.
		* <p>
		* This is the same as {@link ServiceState#getVoiceRoamingType()}.
		* @hide
		*/
		public static final String VOICE_ROAMING_TYPE = "voice_roaming_type";

		/**
		* An integer value indicating the current data roaming type.
		* <p>
		* This is the same as {@link ServiceState#getDataRoamingType()}.
		* @hide
		*/
		public static final String DATA_ROAMING_TYPE = "data_roaming_type";

		/**
		* The current registered voice network operator name in long alphanumeric format.
		* <p>
		* This is the same as {@link ServiceState#getOperatorAlphaLong()}.
		* @hide
		*/
		public static final String VOICE_OPERATOR_ALPHA_LONG = "voice_operator_alpha_long";

		/**
		* The current registered operator name in short alphanumeric format.
		* <p>
		* In GSM/UMTS, short format can be up to 8 characters long. The current registered voice
		* network operator name in long alphanumeric format.
		* <p>
		* This is the same as {@link ServiceState#getOperatorAlphaShort()}.
		* @hide
		*/
		public static final String VOICE_OPERATOR_ALPHA_SHORT = "voice_operator_alpha_short";

		/**
		* The current registered operator numeric id.
		* <p>
		@@ -4652,126 +4578,12 @@ public final class Telephony {
		*/
		public static final String VOICE_OPERATOR_NUMERIC = "voice_operator_numeric";

		/**
		* The current registered data network operator name in long alphanumeric format.
		* <p>
		* This is the same as {@link ServiceState#getOperatorAlphaLong()}.
		* @hide
		*/
		public static final String DATA_OPERATOR_ALPHA_LONG = "data_operator_alpha_long";

		/**
		* The current registered data network operator name in short alphanumeric format.
		* <p>
		* This is the same as {@link ServiceState#getOperatorAlphaShort()}.
		* @hide
		*/
		public static final String DATA_OPERATOR_ALPHA_SHORT = "data_operator_alpha_short";

		/**
		* The current registered data network operator numeric id.
		* <p>
		* This is the same as {@link ServiceState#getOperatorNumeric()}.
		* @hide
		*/
		public static final String DATA_OPERATOR_NUMERIC = "data_operator_numeric";

		/**
		* The current network selection mode.
		* <p>
		* This is the same as {@link ServiceState#getIsManualSelection()}.
		*/
		public static final String IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";

		/**
		* This is the same as {@link ServiceState#getRilVoiceRadioTechnology()}.
		* @hide
		*/
		public static final String RIL_VOICE_RADIO_TECHNOLOGY = "ril_voice_radio_technology";

		/**
		* This is the same as {@link ServiceState#getRilDataRadioTechnology()}.
		* @hide
		*/
		public static final String RIL_DATA_RADIO_TECHNOLOGY = "ril_data_radio_technology";

		/**
		* This is the same as {@link ServiceState#getCssIndicator()}.
		* @hide
		*/
		public static final String CSS_INDICATOR = "css_indicator";

		/**
		* This is the same as {@link ServiceState#getCdmaNetworkId()}.
		* @hide
		*/
		public static final String NETWORK_ID = "network_id";

		/**
		* This is the same as {@link ServiceState#getCdmaSystemId()}.
		* @hide
		*/
		public static final String SYSTEM_ID = "system_id";

		/**
		* This is the same as {@link ServiceState#getCdmaRoamingIndicator()}.
		* @hide
		*/
		public static final String CDMA_ROAMING_INDICATOR = "cdma_roaming_indicator";

		/**
		* This is the same as {@link ServiceState#getCdmaDefaultRoamingIndicator()}.
		* @hide
		*/
		public static final String CDMA_DEFAULT_ROAMING_INDICATOR =
		"cdma_default_roaming_indicator";

		/**
		* This is the same as {@link ServiceState#getCdmaEriIconIndex()}.
		* @hide
		*/
		public static final String CDMA_ERI_ICON_INDEX = "cdma_eri_icon_index";

		/**
		* This is the same as {@link ServiceState#getCdmaEriIconMode()}.
		* @hide
		*/
		public static final String CDMA_ERI_ICON_MODE = "cdma_eri_icon_mode";

		/**
		* This is the same as {@link ServiceState#isEmergencyOnly()}.
		* @hide
		*/
		public static final String IS_EMERGENCY_ONLY = "is_emergency_only";

		/**
		* This is the same as {@link ServiceState#getDataRoamingFromRegistration()}.
		* @hide
		*/
		public static final String IS_DATA_ROAMING_FROM_REGISTRATION =
		"is_data_roaming_from_registration";

		/**
		* This is the same as {@link ServiceState#isUsingCarrierAggregation()}.
		* @hide
		*/
		public static final String IS_USING_CARRIER_AGGREGATION = "is_using_carrier_aggregation";

		/**
		* The current registered raw data network operator name in long alphanumeric format.
		* <p>
		* This is the same as {@link ServiceState#getOperatorAlphaLongRaw()}.
		* @hide
		*/
		public static final String OPERATOR_ALPHA_LONG_RAW = "operator_alpha_long_raw";

		/**
		* The current registered raw data network operator name in short alphanumeric format.
		* <p>
		* This is the same as {@link ServiceState#getOperatorAlphaShortRaw()}.
		* @hide
		*/
		public static final String OPERATOR_ALPHA_SHORT_RAW = "operator_alpha_short_raw";
		}

		/**