Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Expose NetworkRegistrationInfo.getNrState() as public API""

Browse Source
This commit is contained in:
Chiachang Wang
2021-03-02 06:31:26 +00:00
committed by Gerrit Code Review
parent 93f749b245 1e427c1e0a
commit 237d2d47a4
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -40151,7 +40151,6 @@ package android.telephony {
method @NonNull public java.util.List<java.lang.Integer> getAvailableServices(); method @NonNull public java.util.List<java.lang.Integer> getAvailableServices();
method @Nullable public android.telephony.CellIdentity getCellIdentity(); method @Nullable public android.telephony.CellIdentity getCellIdentity();
method public int getDomain(); method public int getDomain();
method public int getNrState();
method @Nullable public String getRegisteredPlmn(); method @Nullable public String getRegisteredPlmn();
method public int getTransportType(); method public int getTransportType();
method public boolean isRegistered(); method public boolean isRegistered();

4
services/core/java/com/android/server/connectivity/DataConnectionStats.java
View File

@@ -52,6 +52,7 @@ public class DataConnectionStats extends BroadcastReceiver {
private SignalStrength mSignalStrength; private SignalStrength mSignalStrength;
private ServiceState mServiceState; private ServiceState mServiceState;
private int mDataState = TelephonyManager.DATA_DISCONNECTED; private int mDataState = TelephonyManager.DATA_DISCONNECTED;
private int mNrState = NetworkRegistrationInfo.NR_STATE_NONE;
public DataConnectionStats(Context context, Handler listenerHandler) { public DataConnectionStats(Context context, Handler listenerHandler) {
mContext = context; mContext = context;
@@ -99,7 +100,7 @@ public class DataConnectionStats extends BroadcastReceiver {
: regInfo.getAccessNetworkTechnology(); : regInfo.getAccessNetworkTechnology();
// If the device is in NSA NR connection the networkType will report as LTE. // If the device is in NSA NR connection the networkType will report as LTE.
// For cell dwell rate metrics, this should report NR instead. // For cell dwell rate metrics, this should report NR instead.
if (regInfo != null && regInfo.getNrState() == NetworkRegistrationInfo.NR_STATE_CONNECTED) { if (mNrState == NetworkRegistrationInfo.NR_STATE_CONNECTED) {
networkType = TelephonyManager.NETWORK_TYPE_NR; networkType = TelephonyManager.NETWORK_TYPE_NR;
} }
if (DEBUG) Log.d(TAG, String.format("Noting data connection for network type %s: %svisible", if (DEBUG) Log.d(TAG, String.format("Noting data connection for network type %s: %svisible",
@@ -171,6 +172,7 @@ public class DataConnectionStats extends BroadcastReceiver {
@Override @Override
public void onServiceStateChanged(ServiceState state) { public void onServiceStateChanged(ServiceState state) {
mServiceState = state; mServiceState = state;
mNrState = state.getNrState();
notePhoneDataConnectionState(); notePhoneDataConnectionState();
} }

1
telephony/java/android/telephony/NetworkRegistrationInfo.java
View File

@@ -371,6 +371,7 @@ public final class NetworkRegistrationInfo implements Parcelable {
* Get the 5G NR connection state. * Get the 5G NR connection state.
* *
* @return the 5G NR connection state. * @return the 5G NR connection state.
* @hide
*/ */
public @NRState int getNrState() { public @NRState int getNrState() {
return mNrState; return mNrState;