diff options
| author | Rambo Wang <rambowang@google.com> | 2021-11-08 22:42:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-11-08 22:42:44 +0000 |
| commit | 5f5602b63e7ef904e41a3c2aaf1b89be581b6a99 (patch) | |
| tree | 4fff093de8d480f1cec8652af69a8dd5d5c79200 | |
| parent | 2ffb85620d98f4d19a7cbd8ca435c68b29e6c550 (diff) | |
| parent | c8f5760478033d97473f18ba1eb24d550b51e14f (diff) | |
| download | Bluetooth-5f5602b63e7ef904e41a3c2aaf1b89be581b6a99.tar.gz | |
Merge "Disable the SignalStrengthUpdateRequest in Bluetooth pkg"
| -rw-r--r-- | src/com/android/bluetooth/hfp/HeadsetPhoneState.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/com/android/bluetooth/hfp/HeadsetPhoneState.java b/src/com/android/bluetooth/hfp/HeadsetPhoneState.java index c1c43c867..4bf75304e 100644 --- a/src/com/android/bluetooth/hfp/HeadsetPhoneState.java +++ b/src/com/android/bluetooth/hfp/HeadsetPhoneState.java @@ -22,7 +22,6 @@ import android.os.Handler; import android.telephony.PhoneStateListener; import android.telephony.ServiceState; import android.telephony.SignalStrength; -import android.telephony.SignalStrengthUpdateRequest; import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener; import android.telephony.TelephonyManager; @@ -71,7 +70,8 @@ public class HeadsetPhoneState { private final HashMap<BluetoothDevice, Integer> mDeviceEventMap = new HashMap<>(); private PhoneStateListener mPhoneStateListener; private final OnSubscriptionsChangedListener mOnSubscriptionsChangedListener; - private SignalStrengthUpdateRequest mSignalStrengthUpdateRequest; + // TODO(b/205585585): Re-enable SignalStrengthUpdateRequest to support "always report signal + // strength" when the crash is fixed. HeadsetPhoneState(HeadsetService headsetService) { Objects.requireNonNull(headsetService, "headsetService is null"); @@ -87,9 +87,6 @@ public class HeadsetPhoneState { mOnSubscriptionsChangedListener = new HeadsetPhoneStateOnSubscriptionChangedListener(); mSubscriptionManager.addOnSubscriptionsChangedListener(command -> mHandler.post(command), mOnSubscriptionsChangedListener); - mSignalStrengthUpdateRequest = new SignalStrengthUpdateRequest.Builder() - .setSystemThresholdReportingRequestedWhileIdle(true) - .build(); } /** @@ -161,9 +158,6 @@ public class HeadsetPhoneState { Log.i(TAG, "startListenForPhoneState(), subId=" + subId + ", enabled_events=" + events); mPhoneStateListener = new HeadsetPhoneStateListener(command -> mHandler.post(command)); mTelephonyManager.listen(mPhoneStateListener, events); - if ((events & PhoneStateListener.LISTEN_SIGNAL_STRENGTHS) != 0) { - mTelephonyManager.setSignalStrengthUpdateRequest(mSignalStrengthUpdateRequest); - } } private void stopListenForPhoneState() { @@ -175,7 +169,6 @@ public class HeadsetPhoneState { + getTelephonyEventsToListen()); mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE); mPhoneStateListener = null; - mTelephonyManager.clearSignalStrengthUpdateRequest(mSignalStrengthUpdateRequest); } int getCindService() { |