Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ee618bb authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Move EXTRA_SERVICE_STATE from Intent to ServiceState. 

This extra is not exposed and is not used by anyone as such.
Leaving it there for internal use/unsupported app usage.

Test: basic sanity
Bug: 140908357
Merged-in: I9fe6e904291affb1cd7b705212d47525b61a5679
Change-Id: I9fe6e904291affb1cd7b705212d47525b61a5679
(cherry picked from commit bb61b17c)
parent f035fd91

core/java/android/content/Intent.java

+0 −6
Original line number Original line Diff line number Diff line
@@ -4514,12 +4514,6 @@ public class Intent implements Parcelable, Cloneable { 
    @SystemApi

    @SystemApi

    public static final String EXTRA_LTE_EARFCN_RSRP_BOOST = "LteEarfcnRsrpBoost";

    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

     * 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

     * CharSequence. Note that this may be a styled CharSequence, so you must use

telephony/java/android/telephony/ServiceState.java

+10 −2
Original line number Original line Diff line number Diff line
@@ -317,6 +317,14 @@ public class ServiceState implements Parcelable { 
     */

     */

    public static final int UNKNOWN_ID = -1;

    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 mOperatorAlphaLong;

    private String mOperatorAlphaShort;

    private String mOperatorAlphaShort;

    private String mOperatorNumeric;

    private String mOperatorNumeric;
@@ -1292,7 +1300,7 @@ public class ServiceState implements Parcelable { 
     */

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage

    private void setFromNotifierBundle(Bundle m) {

    private void setFromNotifierBundle(Bundle m) {

        ServiceState ssFromBundle = m.getParcelable(Intent.EXTRA_SERVICE_STATE);

        ServiceState ssFromBundle = m.getParcelable(EXTRA_SERVICE_STATE);

        if (ssFromBundle != null) {

        if (ssFromBundle != null) {

            copyFrom(ssFromBundle);

            copyFrom(ssFromBundle);

        }

        }
@@ -1310,7 +1318,7 @@ public class ServiceState implements Parcelable { 
     */

     */

    @SystemApi

    @SystemApi

    public void fillInNotifierBundle(@NonNull Bundle m) {

    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.

        // serviceState already consists of below entries.

        // for backward compatibility, we continue fill in below entries.

        // for backward compatibility, we continue fill in below entries.

        m.putInt("voiceRegState", mVoiceRegState);

        m.putInt("voiceRegState", mVoiceRegState);