Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 798a2bc5 authored by Rambo Wang's avatar Rambo Wang
Browse files

Support "always report signal strength" in BT pkg with new API 

"Always report signal strength" was used to report system signal
strength when device is idle in Bluetooth package. The feature
is obsoleted and has been cleared up in b/177924721.

The function is supported now by the API
SignalStrengthUpdateRequest#setSystemThresholdReportingRequestedWhileIdle
newly introduced in S release.

Bug: 205585585
Test: atest HeadsetPhoneStateTest
Test: manual BT functions test to make sure no crash
Change-Id: I43340f6a3d8ad9e97019ddd416ac4823930d3931
parent 4e208206

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

+11 −2
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.Handler; 
import android.telephony.PhoneStateListener;

import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;

import android.telephony.ServiceState;

import android.telephony.SignalStrength;

import android.telephony.SignalStrength;

import android.telephony.SignalStrengthUpdateRequest;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;

import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;
@@ -29,6 +30,7 @@ import android.util.Log; 




import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;





import java.util.Collections;

import java.util.HashMap;

import java.util.HashMap;

import java.util.Objects;

import java.util.Objects;

import java.util.concurrent.Executor;

import java.util.concurrent.Executor;
@@ -70,8 +72,7 @@ public class HeadsetPhoneState { 
    private final HashMap<BluetoothDevice, Integer> mDeviceEventMap = new HashMap<>();

    private final HashMap<BluetoothDevice, Integer> mDeviceEventMap = new HashMap<>();

    private PhoneStateListener mPhoneStateListener;

    private PhoneStateListener mPhoneStateListener;

    private final OnSubscriptionsChangedListener mOnSubscriptionsChangedListener;

    private final OnSubscriptionsChangedListener mOnSubscriptionsChangedListener;

    // TODO(b/205585585): Re-enable SignalStrengthUpdateRequest to support "always report signal

    private SignalStrengthUpdateRequest mSignalStrengthUpdateRequest;

    // strength" when the crash is fixed.





    HeadsetPhoneState(HeadsetService headsetService) {

    HeadsetPhoneState(HeadsetService headsetService) {

        Objects.requireNonNull(headsetService, "headsetService is null");

        Objects.requireNonNull(headsetService, "headsetService is null");
@@ -87,6 +88,10 @@ public class HeadsetPhoneState { 
        mOnSubscriptionsChangedListener = new HeadsetPhoneStateOnSubscriptionChangedListener();

        mOnSubscriptionsChangedListener = new HeadsetPhoneStateOnSubscriptionChangedListener();

        mSubscriptionManager.addOnSubscriptionsChangedListener(command -> mHandler.post(command),

        mSubscriptionManager.addOnSubscriptionsChangedListener(command -> mHandler.post(command),

                mOnSubscriptionsChangedListener);

                mOnSubscriptionsChangedListener);

        mSignalStrengthUpdateRequest = new SignalStrengthUpdateRequest.Builder()

                .setSignalThresholdInfos(Collections.EMPTY_LIST)

                .setSystemThresholdReportingRequestedWhileIdle(true)

                .build();

    }

    }





    /**

    /**
@@ -158,6 +163,9 @@ public class HeadsetPhoneState { 
        Log.i(TAG, "startListenForPhoneState(), subId=" + subId + ", enabled_events=" + events);

        Log.i(TAG, "startListenForPhoneState(), subId=" + subId + ", enabled_events=" + events);

        mPhoneStateListener = new HeadsetPhoneStateListener(command -> mHandler.post(command));

        mPhoneStateListener = new HeadsetPhoneStateListener(command -> mHandler.post(command));

        mTelephonyManager.listen(mPhoneStateListener, events);

        mTelephonyManager.listen(mPhoneStateListener, events);

        if ((events & PhoneStateListener.LISTEN_SIGNAL_STRENGTHS) != 0) {

            mTelephonyManager.setSignalStrengthUpdateRequest(mSignalStrengthUpdateRequest);

        }

    }

    }





    private void stopListenForPhoneState() {

    private void stopListenForPhoneState() {
@@ -169,6 +177,7 @@ public class HeadsetPhoneState { 
                + getTelephonyEventsToListen());

                + getTelephonyEventsToListen());

        mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);

        mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);

        mPhoneStateListener = null;

        mPhoneStateListener = null;

        mTelephonyManager.clearSignalStrengthUpdateRequest(mSignalStrengthUpdateRequest);

    }

    }





    int getCindService() {

    int getCindService() {

android/app/tests/unit/src/com/android/bluetooth/hfp/HeadsetPhoneStateTest.java

+23 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ import android.os.IBinder; 
import android.os.Looper;

import android.os.Looper;

import android.os.ServiceManager;

import android.os.ServiceManager;

import android.telephony.PhoneStateListener;

import android.telephony.PhoneStateListener;

import android.telephony.SignalStrengthUpdateRequest;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;
@@ -140,6 +141,8 @@ public class HeadsetPhoneStateTest { 
                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS));

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS));

        verify(mTelephonyManager).setSignalStrengthUpdateRequest(

                any(SignalStrengthUpdateRequest.class));

    }

    }





    /**

    /**
@@ -153,9 +156,14 @@ public class HeadsetPhoneStateTest { 
                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS));

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS));

        verify(mTelephonyManager).setSignalStrengthUpdateRequest(

                any(SignalStrengthUpdateRequest.class));



        mHeadsetPhoneState.listenForPhoneState(device1, PhoneStateListener.LISTEN_SERVICE_STATE);

        mHeadsetPhoneState.listenForPhoneState(device1, PhoneStateListener.LISTEN_SERVICE_STATE);

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_NONE));

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_NONE));

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE));

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE));

        verify(mTelephonyManager).clearSignalStrengthUpdateRequest(

                any(SignalStrengthUpdateRequest.class));

    }

    }





    /**

    /**
@@ -168,8 +176,13 @@ public class HeadsetPhoneStateTest { 
                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS));

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS));

        verify(mTelephonyManager).setSignalStrengthUpdateRequest(

                any(SignalStrengthUpdateRequest.class));



        mHeadsetPhoneState.listenForPhoneState(device1, PhoneStateListener.LISTEN_NONE);

        mHeadsetPhoneState.listenForPhoneState(device1, PhoneStateListener.LISTEN_NONE);

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_NONE));

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_NONE));

        verify(mTelephonyManager).clearSignalStrengthUpdateRequest(

                any(SignalStrengthUpdateRequest.class));

    }

    }





    /**

    /**
@@ -186,6 +199,9 @@ public class HeadsetPhoneStateTest { 
                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS));

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS));

        verify(mTelephonyManager).setSignalStrengthUpdateRequest(

                any(SignalStrengthUpdateRequest.class));



        // Enabling updates from second device should not trigger the same subscription

        // Enabling updates from second device should not trigger the same subscription

        mHeadsetPhoneState.listenForPhoneState(device2, PhoneStateListener.LISTEN_SERVICE_STATE

        mHeadsetPhoneState.listenForPhoneState(device2, PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
@@ -194,6 +210,8 @@ public class HeadsetPhoneStateTest { 
        // Disabling updates from second device should cancel subscription

        // Disabling updates from second device should cancel subscription

        mHeadsetPhoneState.listenForPhoneState(device2, PhoneStateListener.LISTEN_NONE);

        mHeadsetPhoneState.listenForPhoneState(device2, PhoneStateListener.LISTEN_NONE);

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_NONE));

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_NONE));

        verify(mTelephonyManager).clearSignalStrengthUpdateRequest(

                any(SignalStrengthUpdateRequest.class));

    }

    }





    /**

    /**
@@ -215,6 +233,9 @@ public class HeadsetPhoneStateTest { 
        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_NONE));

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_NONE));

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS));

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS));

        verify(mTelephonyManager).setSignalStrengthUpdateRequest(

                any(SignalStrengthUpdateRequest.class));



        // Partially disabling updates from first device should not cancel all subscription

        // Partially disabling updates from first device should not cancel all subscription

        mHeadsetPhoneState.listenForPhoneState(device1, PhoneStateListener.LISTEN_NONE);

        mHeadsetPhoneState.listenForPhoneState(device1, PhoneStateListener.LISTEN_NONE);

        verify(mTelephonyManager, times(2)).listen(any(), eq(PhoneStateListener.LISTEN_NONE));

        verify(mTelephonyManager, times(2)).listen(any(), eq(PhoneStateListener.LISTEN_NONE));
@@ -223,5 +244,7 @@ public class HeadsetPhoneStateTest { 
        // Partially disabling updates from second device should cancel subscription

        // Partially disabling updates from second device should cancel subscription

        mHeadsetPhoneState.listenForPhoneState(device2, PhoneStateListener.LISTEN_NONE);

        mHeadsetPhoneState.listenForPhoneState(device2, PhoneStateListener.LISTEN_NONE);

        verify(mTelephonyManager, times(3)).listen(any(), eq(PhoneStateListener.LISTEN_NONE));

        verify(mTelephonyManager, times(3)).listen(any(), eq(PhoneStateListener.LISTEN_NONE));

        verify(mTelephonyManager, times(3)).clearSignalStrengthUpdateRequest(

                any(SignalStrengthUpdateRequest.class));

    }

    }

}
 
}