Commit 36705414 by olly Committed by Oliver Woodman

Add option to disable 5G-NSA disambiguation

PiperOrigin-RevId: 384575860
parent e403dda1
......@@ -59,6 +59,7 @@ public final class NetworkTypeObserver {
}
@Nullable private static NetworkTypeObserver staticInstance;
private static volatile boolean disable5GNsaDisambiguation;
private final Handler mainHandler;
// This class needs to hold weak references as it doesn't require listeners to unregister.
......@@ -69,6 +70,11 @@ public final class NetworkTypeObserver {
@C.NetworkType
private int networkType;
/** Disables logic to disambiguate 5G-NSA networks from 4G networks. */
public static void disable5GNsaDisambiguation() {
disable5GNsaDisambiguation = true;
}
/**
* Returns a network type observer instance.
*
......@@ -217,7 +223,7 @@ public final class NetworkTypeObserver {
@Override
public void onReceive(Context context, Intent intent) {
@C.NetworkType int networkType = getNetworkTypeFromConnectivityManager(context);
if (networkType == C.NETWORK_TYPE_4G && Util.SDK_INT >= 29) {
if (Util.SDK_INT >= 29 && !disable5GNsaDisambiguation && networkType == C.NETWORK_TYPE_4G) {
// Delay update of the network type to check whether this is actually 5G-NSA.
try {
// We can't access TelephonyManager getters like getServiceState() directly as they
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment