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

Merge "Smoother signal bar transition during CBRS data switching" into rvc-dev

Browse Source
This commit is contained in:
Xiangyu/Malcolm Chen
2020-02-28 00:40:28 +00:00
committed by Android (Google) Code Review
parent 720830ee90 0c63c4daff
commit 806e50963c
1 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
View File

@@ -17,6 +17,7 @@
package com.android.systemui.statusbar.policy; package com.android.systemui.statusbar.policy;
import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED; import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_IN; import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_IN;
import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_INOUT; import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_INOUT;
import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_NONE; import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_NONE;
@@ -157,6 +158,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
ServiceState mLastServiceState; ServiceState mLastServiceState;
private boolean mUserSetup; private boolean mUserSetup;
private boolean mSimDetected; private boolean mSimDetected;
private boolean mForceCellularValidated;
private ConfigurationController.ConfigurationListener mConfigurationListener = private ConfigurationController.ConfigurationListener mConfigurationListener =
new ConfigurationController.ConfigurationListener() { new ConfigurationController.ConfigurationListener() {
@@ -284,12 +286,41 @@ public class NetworkControllerImpl extends BroadcastReceiver
mPhoneStateListener = new PhoneStateListener(mReceiverHandler::post) { mPhoneStateListener = new PhoneStateListener(mReceiverHandler::post) {
@Override @Override
public void onActiveDataSubscriptionIdChanged(int subId) { public void onActiveDataSubscriptionIdChanged(int subId) {
// For data switching from A to B, we assume B is validated for up to 2 seconds iff:
// 1) A and B are in the same subscription group e.g. CBRS data switch. And
// 2) A was validated before the switch.
// This is to provide smooth transition for UI without showing cross during data
// switch.
if (keepCellularValidationBitInSwitch(mActiveMobileDataSubscription, subId)) {
if (DEBUG) Log.d(TAG, ": mForceCellularValidated to true.");
mForceCellularValidated = true;
mReceiverHandler.removeCallbacks(mClearForceValidated);
mReceiverHandler.postDelayed(mClearForceValidated, 2000);
}
mActiveMobileDataSubscription = subId; mActiveMobileDataSubscription = subId;
doUpdateMobileControllers(); doUpdateMobileControllers();
} }
}; };
} }
private final Runnable mClearForceValidated = () -> {
if (DEBUG) Log.d(TAG, ": mClearForceValidated");
mForceCellularValidated = false;
updateConnectivity();
};
boolean isInGroupDataSwitch(int subId1, int subId2) {
SubscriptionInfo info1 = mSubscriptionManager.getActiveSubscriptionInfo(subId1);
SubscriptionInfo info2 = mSubscriptionManager.getActiveSubscriptionInfo(subId2);
return (info1 != null && info2 != null && info1.getGroupUuid() != null
&& info1.getGroupUuid().equals(info2.getGroupUuid()));
}
boolean keepCellularValidationBitInSwitch(int sourceSubId, int destSubId) {
return mValidatedTransports.get(TRANSPORT_CELLULAR)
&& isInGroupDataSwitch(sourceSubId, destSubId);
}
public DataSaverController getDataSaverController() { public DataSaverController getDataSaverController() {
return mDataSaverController; return mDataSaverController;
} }
@@ -793,6 +824,8 @@ public class NetworkControllerImpl extends BroadcastReceiver
} }
} }
if (mForceCellularValidated) mValidatedTransports.set(TRANSPORT_CELLULAR);
if (CHATTY) { if (CHATTY) {
Log.d(TAG, "updateConnectivity: mConnectedTransports=" + mConnectedTransports); Log.d(TAG, "updateConnectivity: mConnectedTransports=" + mConnectedTransports);
Log.d(TAG, "updateConnectivity: mValidatedTransports=" + mValidatedTransports); Log.d(TAG, "updateConnectivity: mValidatedTransports=" + mValidatedTransports);