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

Merge "Remove usage of SignalStrength.getCdmaLevel() API" am: da41e66438

Browse Source 
am: 76e84a1246

Change-Id: Id8420b5e2e6c72df98e76d4aa987400d7c6fb22a
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-12 10:05:22 -08:00
committed by android-build-merger
parent 022a88a9b7 76e84a1246
commit b71eb484e7
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
View File

@@ -23,6 +23,8 @@ import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.provider.Settings.Global;
import android.telephony.CellSignalStrength;
import android.telephony.CellSignalStrengthCdma;
import android.telephony.NetworkRegistrationInfo;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
@@ -50,6 +52,7 @@ import com.android.systemui.statusbar.policy.NetworkControllerImpl.SubscriptionD
import java.io.PrintWriter;
import java.util.BitSet;
import java.util.Objects;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -480,6 +483,18 @@ public class MobileSignalController extends SignalController<
}
}
/**
* Extracts the CellSignalStrengthCdma from SignalStrength then returns the level
*/
private final int getCdmaLevel() {
List<CellSignalStrengthCdma> signalStrengthCdma =
mSignalStrength.getCellSignalStrengths(CellSignalStrengthCdma.class);
if (!signalStrengthCdma.isEmpty()) {
return signalStrengthCdma.get(0).getLevel();
}
return CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
}
/**
* Updates the current state based on mServiceState, mSignalStrength, mDataNetType,
* mDataState, and mSimState. It should be called any time one of these is updated.
@@ -495,7 +510,7 @@ public class MobileSignalController extends SignalController<
&& mSignalStrength != null;
if (mCurrentState.connected) {
if (!mSignalStrength.isGsm() && mConfig.alwaysShowCdmaRssi) {
mCurrentState.level = mSignalStrength.getCdmaLevel();
mCurrentState.level = getCdmaLevel();
} else {
mCurrentState.level = mSignalStrength.getLevel();
}