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

Merge changes from topic "signal-strength-cleanup" am: fb24180fe0 am: 2621c9f6ad

Browse Source 
am: d5c9522b43

Change-Id: I8c30c1401e97adcb026a25607a737bd336685807
This commit is contained in:
nharold
2018-01-24 01:19:36 +00:00
committed by android-build-merger
parent 1b274d9365 d5c9522b43
commit 277ff08723
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
telephony/java/android/telephony/SignalStrength.java
View File

@@ -492,14 +492,12 @@ public class SignalStrength implements Parcelable {
public int getAsuLevel() {
int asuLevel = 0;
if (mIsGsm) {
if (getLteLevel() == SIGNAL_STRENGTH_NONE_OR_UNKNOWN) {
if (getTdScdmaLevel() == SIGNAL_STRENGTH_NONE_OR_UNKNOWN) {
asuLevel = getGsmAsuLevel();
} else {
asuLevel = getTdScdmaAsuLevel();
}
} else {
if (mLteRsrp != SignalStrength.INVALID) {
asuLevel = getLteAsuLevel();
} else if (mTdScdmaRscp != SignalStrength.INVALID) {
asuLevel = getTdScdmaAsuLevel();
} else {
asuLevel = getGsmAsuLevel();
}
} else {
int cdmaAsuLevel = getCdmaAsuLevel();