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

Commit 538fd0d4 authored by Malcolm Chen's avatar Malcolm Chen
Browse files

[Telephony Mainline] Make newFromBundle and fillInNotifierBundle System 

API

The APIs are used in several placed where listens to
SERVICE_STATE_CHANGE broadcast.

Bug: 140908357
Test: build
Change-Id: I84543dbb056694d975799c7959c7ed66e286c530
Merged-In: I84543dbb056694d975799c7959c7ed66e286c530
parent b9446af5

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -8762,6 +8762,7 @@ package android.telephony { 














  public class ServiceState implements android.os.Parcelable {















    method @NonNull public android.telephony.ServiceState createLocationInfoSanitizedCopy(boolean);













    method public void fillInNotifierBundle(@NonNull android.os.Bundle);















    method public int getDataRegistrationState();















    method @Nullable public android.telephony.NetworkRegistrationInfo getNetworkRegistrationInfo(int, int);















    method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList();









@@ -8770,6 +8771,7 @@ package android.telephony {













    method public int getNrFrequencyRange();















    method @Nullable public String getOperatorAlphaLongRaw();















    method @Nullable public String getOperatorAlphaShortRaw();













    method @NonNull public static android.telephony.ServiceState newFromBundle(@NonNull android.os.Bundle);















    field public static final int ROAMING_TYPE_DOMESTIC = 2; // 0x2















    field public static final int ROAMING_TYPE_INTERNATIONAL = 3; // 0x3















    field public static final int ROAMING_TYPE_NOT_ROAMING = 0; // 0x0

























config/boot-image-profile.txt



+0
−1




























Original line number
Diff line number
Diff line








@@ -14142,7 +14142,6 @@ HSPLandroid/telephony/ServiceState;->convertNetworkTypeBitmaskToBearerBitmask(I)













HSPLandroid/telephony/ServiceState;->copyFrom(Landroid/telephony/ServiceState;)V















HSPLandroid/telephony/ServiceState;->describeContents()I















HSPLandroid/telephony/ServiceState;->equals(Ljava/lang/Object;)Z













HSPLandroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V















HSPLandroid/telephony/ServiceState;->getCdmaDefaultRoamingIndicator()I















HSPLandroid/telephony/ServiceState;->getCdmaEriIconIndex()I















HSPLandroid/telephony/ServiceState;->getCdmaEriIconMode()I

























telephony/java/android/telephony/ServiceState.java



+9
−5




























Original line number
Diff line number
Diff line








@@ -379,15 +379,15 @@ public class ServiceState implements Parcelable {













    /**















     * Create a new ServiceState from a intent notifier Bundle















     *













     * This method is used by PhoneStateIntentReceiver, CellBroadcastReceiver, and maybe by













     * external applications.













     * This method is used to get ServiceState object from extras upon receiving













     * {@link Intent#ACTION_SERVICE_STATE}.















     *















     * @param m Bundle from intent notifier















     * @return newly created ServiceState















     * @hide















     */













    @SystemApi















    @NonNull













    @UnsupportedAppUsage















    public static ServiceState newFromBundle(@NonNull Bundle m) {















        ServiceState ret;















        ret = new ServiceState();










@@ -1281,11 +1281,15 @@ public class ServiceState implements Parcelable {













    /**















     * Set intent notifier Bundle based on service state.















     *













     * Put ServiceState object and its fields into bundle which is used by TelephonyRegistry













     * to broadcast {@link Intent#ACTION_SERVICE_STATE}.













     *















     * @param m intent notifier Bundle















     * @hide













     *















     */













    @UnsupportedAppUsage













    public void fillInNotifierBundle(Bundle m) {













    @SystemApi













    public void fillInNotifierBundle(@NonNull Bundle m) {















        m.putParcelable(Intent.EXTRA_SERVICE_STATE, this);















        // serviceState already consists of below entries.















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