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

Commit cb9530f2 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Expose NetworkRegistrationInfo.getNrState() as public API" am:... 

Merge "Expose NetworkRegistrationInfo.getNrState() as public API" am: f177ac13 am: b6376059 am: ab746aa2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1467045

Change-Id: I111cbae01fb9aea68a9bc0b63bd6f5caae4011e9
parents 4332cd04 ab746aa2

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -47671,6 +47671,7 @@ package android.telephony { 
    method @NonNull public java.util.List<java.lang.Integer> getAvailableServices();

    method @Nullable public android.telephony.CellIdentity getCellIdentity();

    method public int getDomain();

    method public int getNrState();

    method @Nullable public String getRegisteredPlmn();

    method public int getTransportType();

    method public boolean isRegistered();

non-updatable-api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -45839,6 +45839,7 @@ package android.telephony { 
    method @NonNull public java.util.List<java.lang.Integer> getAvailableServices();

    method @Nullable public android.telephony.CellIdentity getCellIdentity();

    method public int getDomain();

    method public int getNrState();

    method @Nullable public String getRegisteredPlmn();

    method public int getTransportType();

    method public boolean isRegistered();

services/core/java/com/android/server/connectivity/DataConnectionStats.java

+1 −3
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ public class DataConnectionStats extends BroadcastReceiver { 
    private SignalStrength mSignalStrength;

    private ServiceState mServiceState;

    private int mDataState = TelephonyManager.DATA_DISCONNECTED;

    private int mNrState = NetworkRegistrationInfo.NR_STATE_NONE;



    public DataConnectionStats(Context context, Handler listenerHandler) {

        mContext = context;
@@ -100,7 +99,7 @@ public class DataConnectionStats extends BroadcastReceiver { 
                : regInfo.getAccessNetworkTechnology();

        // If the device is in NSA NR connection the networkType will report as LTE.

        // For cell dwell rate metrics, this should report NR instead.

        if (mNrState == NetworkRegistrationInfo.NR_STATE_CONNECTED) {

        if (regInfo != null && regInfo.getNrState() == NetworkRegistrationInfo.NR_STATE_CONNECTED) {

            networkType = TelephonyManager.NETWORK_TYPE_NR;

        }

        if (DEBUG) Log.d(TAG, String.format("Noting data connection for network type %s: %svisible",
@@ -172,7 +171,6 @@ public class DataConnectionStats extends BroadcastReceiver { 
        @Override

        public void onServiceStateChanged(ServiceState state) {

            mServiceState = state;

            mNrState = state.getNrState();

            notePhoneDataConnectionState();

        }

telephony/java/android/telephony/NetworkRegistrationInfo.java

+0 −1
Original line number Diff line number Diff line
@@ -369,7 +369,6 @@ public final class NetworkRegistrationInfo implements Parcelable { 
     * Get the 5G NR connection state.

     *

     * @return the 5G NR connection state.

     * @hide

     */

    public @NRState int getNrState() {

        return mNrState;