commit c8f5760478033d97473f18ba1eb24d550b51e14f
author Rambo Wang <rambowang@google.com> Mon Nov 08 10:10:56 2021 -0800
committer Rambo Wang <rambowang@google.com> Mon Nov 08 10:21:35 2021 -0800
tree 4fff093de8d480f1cec8652af69a8dd5d5c79200
parent 2ffb85620d98f4d19a7cbd8ca435c68b29e6c550

Disable the SignalStrengthUpdateRequest in Bluetooth pkg

As part of the work to replace feature "always report signal strength"
with SignalStrengthUpdateRequest, Bluetooth pkg introduced
SignalStrengthUpdateRequest in aosp/1569860. However, a crash
is observed.

To resolve the crash while keep the feature continuing, the logic
involves SignalStrengthUpdateRequest has been removed temporarily.
A follow-up CL will bring it back when the crash is fixed.

Bug: 205513835
Test: Manually test to confirm no crash
Change-Id: Ic9c4d5ec118b5d026341a4c024236a46d52b5605

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 c1c43c8..4bf7530 100644
--- a/src/com/android/bluetooth/hfp/HeadsetPhoneState.java
+++ b/src/com/android/bluetooth/hfp/HeadsetPhoneState.java
@@ -22,7 +22,6 @@
 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 @@
     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 @@
         mOnSubscriptionsChangedListener = new HeadsetPhoneStateOnSubscriptionChangedListener();
         mSubscriptionManager.addOnSubscriptionsChangedListener(command -> mHandler.post(command),
                 mOnSubscriptionsChangedListener);
-        mSignalStrengthUpdateRequest = new SignalStrengthUpdateRequest.Builder()
-                .setSystemThresholdReportingRequestedWhileIdle(true)
-                .build();
     }
 
     /**
@@ -161,9 +158,6 @@
         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 @@
                 + getTelephonyEventsToListen());
         mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
         mPhoneStateListener = null;
-        mTelephonyManager.clearSignalStrengthUpdateRequest(mSignalStrengthUpdateRequest);
     }
 
     int getCindService() {