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

Commit 87b06dd8 authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by android-build-merger
Browse files

Merge "Expose the following as system APIs" am: 119d0fa9 am: 8dc9114a 

am: d1844418

Change-Id: I84fd175995a277c4aa8fd430fe6007c62d7cbd0a
parents dfec7ffc d1844418

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -7964,6 +7964,7 @@ package android.telephony { 
  public final class DataSpecificRegistrationInfo implements android.os.Parcelable {

    method public int describeContents();

    method @NonNull public android.telephony.LteVopsSupportInfo getLteVopsSupportInfo();

    method public boolean isUsingCarrierAggregation();

    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.DataSpecificRegistrationInfo> CREATOR;

  }
@@ -8102,6 +8103,7 @@ package android.telephony { 
    method @Nullable public android.telephony.CellIdentity getCellIdentity();

    method @Nullable public android.telephony.DataSpecificRegistrationInfo getDataSpecificInfo();

    method public int getDomain();

    method public int getNrState();

    method public int getRegistrationState();

    method public int getRejectCause();

    method public int getRoamingType();
@@ -8344,6 +8346,7 @@ package android.telephony { 
    method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList();

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

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

    method public int getNrFrequencyRange();

    method @Nullable public String getOperatorAlphaLongRaw();

    method @Nullable public String getOperatorAlphaShortRaw();

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

telephony/java/android/telephony/DataSpecificRegistrationInfo.java

+3 −0
Original line number Diff line number Diff line
@@ -203,9 +203,12 @@ public final class DataSpecificRegistrationInfo implements Parcelable { 
    }



    /**

     * Get whether network has configured carrier aggregation or not.

     *

     * @return {@code true} if using carrier aggregation.

     * @hide

     */

    @SystemApi

    public boolean isUsingCarrierAggregation() {

        return mIsUsingCarrierAggregation;

    }

telephony/java/android/telephony/NetworkRegistrationInfo.java

+3 −0
Original line number Diff line number Diff line
@@ -323,9 +323,12 @@ public final class NetworkRegistrationInfo implements Parcelable { 
    public @Domain int getDomain() { return mDomain; }



    /**

     * Get the 5G NR connection state.

     *

     * @return the 5G NR connection state.

     * @hide

     */

    @SystemApi

    public @NRState int getNrState() {

        return mNrState;

    }

telephony/java/android/telephony/ServiceState.java

+3 −0
Original line number Diff line number Diff line
@@ -1384,9 +1384,12 @@ public class ServiceState implements Parcelable { 
    }



    /**

     * Get the 5G NR frequency range the device is currently registered.

     *

     * @return the frequency range of 5G NR.

     * @hide

     */

    @SystemApi

    public @FrequencyRange int getNrFrequencyRange() {

        return mNrFrequencyRange;

    }