Merge "Move EXTRA_SERVICE_STATE from Intent to ServiceState." (a45fad22) · Commits · e / os / android_frameworks_base

core/java/android/content/Intent.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -4561,12 +4561,6 @@ public class Intent implements Parcelable, Cloneable {
		@SystemApi
		public static final String EXTRA_LTE_EARFCN_RSRP_BOOST = "LteEarfcnRsrpBoost";

		/**
		* An parcelable extra used with {@link #ACTION_SERVICE_STATE} representing the service state.
		* @hide
		*/
		public static final String EXTRA_SERVICE_STATE = "android.intent.extra.SERVICE_STATE";

		/**
		* The name of the extra used to define the text to be processed, as a
		* CharSequence. Note that this may be a styled CharSequence, so you must use

+10 −2

Original line number	Diff line number	Diff line
		@@ -317,6 +317,14 @@ public class ServiceState implements Parcelable {
		*/
		public static final int UNKNOWN_ID = -1;

		/**
		* A parcelable extra used with {@link Intent#ACTION_SERVICE_STATE} representing the service
		* state.
		* @hide
		*/
		private static final String EXTRA_SERVICE_STATE = "android.intent.extra.SERVICE_STATE";


		private String mOperatorAlphaLong;
		private String mOperatorAlphaShort;
		private String mOperatorNumeric;
		@@ -1292,7 +1300,7 @@ public class ServiceState implements Parcelable {
		*/
		@UnsupportedAppUsage
		private void setFromNotifierBundle(Bundle m) {
		ServiceState ssFromBundle = m.getParcelable(Intent.EXTRA_SERVICE_STATE);
		ServiceState ssFromBundle = m.getParcelable(EXTRA_SERVICE_STATE);
		if (ssFromBundle != null) {
		copyFrom(ssFromBundle);
		}
		@@ -1310,7 +1318,7 @@ public class ServiceState implements Parcelable {
		*/
		@SystemApi
		public void fillInNotifierBundle(@NonNull Bundle m) {
		m.putParcelable(Intent.EXTRA_SERVICE_STATE, this);
		m.putParcelable(EXTRA_SERVICE_STATE, this);
		// serviceState already consists of below entries.
		// for backward compatibility, we continue fill in below entries.
		m.putInt("voiceRegState", mVoiceRegState);