commit 1fed51e4eab15ec53d2c54522bebe5ce64129d73
author The Android Automerger <android-build@google.com> Tue Jan 27 06:10:18 2015 -0800
committer The Android Automerger <android-build@google.com> Tue Jan 27 06:10:18 2015 -0800
tree 5d38123786ce785ecfac41a7fed7ba4dcd6945a4
parent 9b0177459ddc1412c4e9d44af53a1badb476bdd9
parent f6377efa78efb29905ea2f6299df904ddf71a3da

merge in lmp-mr1-release history after reset to lmp-mr1-dev

src/com/android/bluetooth/hfp/HeadsetPhoneState.java

diff --git a/src/com/android/bluetooth/hfp/HeadsetPhoneState.java b/src/com/android/bluetooth/hfp/HeadsetPhoneState.java
index ec96375..ee81e62 100644
--- a/src/com/android/bluetooth/hfp/HeadsetPhoneState.java
+++ b/src/com/android/bluetooth/hfp/HeadsetPhoneState.java
@@ -249,7 +249,15 @@
                 if (mService == HeadsetHalConstants.NETWORK_STATE_NOT_AVAILABLE) {
                     mSignal = 0;
                 } else if (signalStrength.isGsm()) {
-                    mSignal = gsmAsuToSignal(signalStrength);
+                    mSignal = signalStrength.getLteLevel();
+                    if (mSignal == SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN) {
+                        mSignal = gsmAsuToSignal(signalStrength);
+                    } else {
+                        // SignalStrength#getLteLevel returns the scale from 0-4
+                        // Bluetooth signal scales at 0-5
+                        // Let's match up the larger side
+                        mSignal++;
+                    }
                 } else {
                     mSignal = cdmaDbmEcioToSignal(signalStrength);
                 }