LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MS42.1] Replace PhoneStateListener with DisplayInfoListener

Browse Source 
Several methods and constants are hidden in PhoneStateListener
and ServiceState to track Radio Access Technology(RAT) types.
Replace them with public API instead.

Test: atest NetworkStatsSubscriptionsMonitorTest
Fix: 213021103
Change-Id: I588398da7f2b031910a8350a7d84405ff101232d
This commit is contained in:
Junyu Lai
2022-01-06 01:12:47 +00:00
parent c3dde6605f
commit 4537656b25
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
service-t/src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java
View File

@@ -18,14 +18,16 @@ package com.android.server.net;
import static android.net.NetworkTemplate.NETWORK_TYPE_5G_NSA; import static android.net.NetworkTemplate.NETWORK_TYPE_5G_NSA;
import static android.net.NetworkTemplate.getCollapsedRatType; import static android.net.NetworkTemplate.getCollapsedRatType;
import static android.telephony.TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED;
import static android.telephony.TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA;
import static android.telephony.TelephonyManager.NETWORK_TYPE_LTE;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.content.Context; import android.content.Context;
import android.telephony.Annotation; import android.telephony.Annotation;
import android.telephony.NetworkRegistrationInfo;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyCallback;
import android.telephony.TelephonyDisplayInfo;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@@ -63,7 +65,7 @@ public class NetworkStatsSubscriptionsMonitor extends
private final Delegate mDelegate; private final Delegate mDelegate;
/** /**
* Receivers that watches for {@link ServiceState} changes for each subscription, to * Receivers that watches for {@link TelephonyDisplayInfo} changes for each subscription, to
* monitor the transitioning between Radio Access Technology(RAT) types for each sub. * monitor the transitioning between Radio Access Technology(RAT) types for each sub.
*/ */
@NonNull @NonNull
@@ -115,13 +117,12 @@ public class NetworkStatsSubscriptionsMonitor extends
continue; continue;
} }
final RatTypeListener listener = final RatTypeListener listener = new RatTypeListener(this, sub.first, sub.second);
new RatTypeListener(mExecutor, this, sub.first, sub.second);
mRatListeners.add(listener); mRatListeners.add(listener);
// Register listener to the telephony manager that associated with specific sub. // Register listener to the telephony manager that associated with specific sub.
mTeleManager.createForSubscriptionId(sub.first) mTeleManager.createForSubscriptionId(sub.first)
.listen(listener, PhoneStateListener.LISTEN_SERVICE_STATE); .registerTelephonyCallback(mExecutor, listener);
Log.d(NetworkStatsService.TAG, "RAT type listener registered for sub " + sub.first); Log.d(NetworkStatsService.TAG, "RAT type listener registered for sub " + sub.first);
} }
@@ -175,7 +176,7 @@ public class NetworkStatsSubscriptionsMonitor extends
private void handleRemoveRatTypeListener(@NonNull RatTypeListener listener) { private void handleRemoveRatTypeListener(@NonNull RatTypeListener listener) {
mTeleManager.createForSubscriptionId(listener.mSubId) mTeleManager.createForSubscriptionId(listener.mSubId)
.listen(listener, PhoneStateListener.LISTEN_NONE); .unregisterTelephonyCallback(listener);
Log.d(NetworkStatsService.TAG, "RAT type listener unregistered for sub " + listener.mSubId); Log.d(NetworkStatsService.TAG, "RAT type listener unregistered for sub " + listener.mSubId);
mRatListeners.remove(listener); mRatListeners.remove(listener);
@@ -185,7 +186,8 @@ public class NetworkStatsSubscriptionsMonitor extends
listener.mSubscriberId, TelephonyManager.NETWORK_TYPE_UNKNOWN); listener.mSubscriberId, TelephonyManager.NETWORK_TYPE_UNKNOWN);
} }
static class RatTypeListener extends PhoneStateListener { static class RatTypeListener extends TelephonyCallback
implements TelephonyCallback.DisplayInfoListener {
// Unique id for the subscription. See {@link SubscriptionInfo#getSubscriptionId}. // Unique id for the subscription. See {@link SubscriptionInfo#getSubscriptionId}.
@NonNull @NonNull
private final int mSubId; private final int mSubId;
@@ -199,29 +201,27 @@ public class NetworkStatsSubscriptionsMonitor extends
@NonNull @NonNull
private final NetworkStatsSubscriptionsMonitor mMonitor; private final NetworkStatsSubscriptionsMonitor mMonitor;
RatTypeListener(@NonNull Executor executor, RatTypeListener(@NonNull NetworkStatsSubscriptionsMonitor monitor, int subId,
@NonNull NetworkStatsSubscriptionsMonitor monitor, int subId,
@NonNull String subscriberId) { @NonNull String subscriberId) {
super(executor);
mSubId = subId; mSubId = subId;
mSubscriberId = subscriberId; mSubscriberId = subscriberId;
mMonitor = monitor; mMonitor = monitor;
} }
@Override @Override
public void onServiceStateChanged(@NonNull ServiceState ss) { public void onDisplayInfoChanged(TelephonyDisplayInfo displayInfo) {
// In 5G SA (Stand Alone) mode, the primary cell itself will be 5G hence telephony // In 5G SA (Stand Alone) mode, the primary cell itself will be 5G hence telephony
// would report RAT = 5G_NR. // would report RAT = 5G_NR.
// However, in 5G NSA (Non Stand Alone) mode, the primary cell is still LTE and // However, in 5G NSA (Non Stand Alone) mode, the primary cell is still LTE and
// network allocates a secondary 5G cell so telephony reports RAT = LTE along with // network allocates a secondary 5G cell so telephony reports RAT = LTE along with
// NR state as connected. In such case, attributes the data usage to NR. // NR state as connected. In such case, attributes the data usage to NR.
// See b/160727498. // See b/160727498.
final boolean is5GNsa = (ss.getDataNetworkType() == TelephonyManager.NETWORK_TYPE_LTE final boolean is5GNsa = displayInfo.getNetworkType() == NETWORK_TYPE_LTE
|| ss.getDataNetworkType() == TelephonyManager.NETWORK_TYPE_LTE_CA) && (displayInfo.getOverrideNetworkType() == OVERRIDE_NETWORK_TYPE_NR_NSA
&& ss.getNrState() == NetworkRegistrationInfo.NR_STATE_CONNECTED; || displayInfo.getOverrideNetworkType() == OVERRIDE_NETWORK_TYPE_NR_ADVANCED);
final int networkType = final int networkType =
(is5GNsa ? NETWORK_TYPE_5G_NSA : ss.getDataNetworkType()); (is5GNsa ? NETWORK_TYPE_5G_NSA : displayInfo.getNetworkType());
final int collapsedRatType = getCollapsedRatType(networkType); final int collapsedRatType = getCollapsedRatType(networkType);
if (collapsedRatType == mLastCollapsedRatType) return; if (collapsedRatType == mLastCollapsedRatType) return;