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

Commit c7967938 authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge changes I7cea765c,Idb4bea1b,I7bf47376,I0cf56537,I4ffb6027 into udc-dev... 

Merge changes I7cea765c,Idb4bea1b,I7bf47376,I0cf56537,I4ffb6027 into udc-dev am: ca4985b4 am: 2202c6c3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23390058



Change-Id: Ie3b2aaad4b9692ffdcbe152e5c14de6c65b2cde0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8cb04c2c 2202c6c3

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

+40 −45
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ public class HeadsetStateMachine extends StateMachine { 
    // Audio disconnect timeout retry count

    private int mAudioDisconnectRetry = 0;



    static final int HFP_SET_AUDIO_POLICY = 1;



    private BluetoothSinkAudioPolicy mHsClientAudioPolicy;



    // Keys are AT commands, and values are the company IDs.
@@ -1964,90 +1966,87 @@ public class HeadsetStateMachine extends StateMachine { 
    }



    /**

     * Look for Android specific AT command starts with AT+ANDROID and try to process it

     * Process Android specific AT commands.

     *

     * @param atString AT command in string

     * @param atString AT command after the "AT+" prefix. Starts with "ANDROID"

     * @param device Remote device that has sent this command

     * @return true if the command is processed, false if not.

     */

    @VisibleForTesting

    boolean checkAndProcessAndroidAt(String atString, BluetoothDevice device) {

        log("checkAndProcessAndroidAt - atString = " + atString);

    private void processAndroidAt(String atString, BluetoothDevice device) {

        log("processAndroidSpecificAt - atString = " + atString);



        if (atString.equals("+ANDROID=?")) {

            // feature request type command

            processAndroidAtFeatureRequest(device);

            mNativeInterface.atResponseCode(device, HeadsetHalConstants.AT_RESPONSE_OK, 0);

            return true;

        } else if (atString.startsWith("+ANDROID=")) {

            // set type command

            int equalIndex = atString.indexOf("=");

            String arg = atString.substring(equalIndex + 1);



            if (arg.isEmpty()) {

                Log.w(TAG, "Android AT command is empty");

                return false;

                Log.e(TAG, "Command Invalid!");

                mNativeInterface.atResponseCode(device, HeadsetHalConstants.AT_RESPONSE_ERROR, 0);

                return;

            }



            Object[] args = generateArgs(arg);



            String type = (String) args[0];

            if (!(args[0] instanceof Integer)) {

                Log.e(TAG, "Type ID is invalid");

                mNativeInterface.atResponseCode(device, HeadsetHalConstants.AT_RESPONSE_ERROR, 0);

                return;

            }



            int type = (Integer) args[0];



            if (type.equals(BluetoothSinkAudioPolicy.HFP_SET_SINK_AUDIO_POLICY_ID)) {

                Log.d(TAG, "Processing command: " + atString);

                if (processAndroidAtSinkAudioPolicy(args, device)) {

                    mNativeInterface.atResponseCode(device,

                            HeadsetHalConstants.AT_RESPONSE_OK, 0);

            if (type == HFP_SET_AUDIO_POLICY) {

                processAndroidAtSetAudioPolicy(args, device);

            } else {

                    Log.w(TAG, "Invalid SinkAudioPolicy parameters!");

                    mNativeInterface.atResponseCode(device,

                            HeadsetHalConstants.AT_RESPONSE_ERROR, 0);

                Log.w(TAG, "Undefined AT+ANDROID command");

                mNativeInterface.atResponseCode(device, HeadsetHalConstants.AT_RESPONSE_ERROR, 0);

                return;

            }

                return true;

        } else {

                Log.w(TAG, "Undefined Android command type: " + type);

                return false;

            }

            Log.e(TAG, "Undefined AT+ANDROID command");

            mNativeInterface.atResponseCode(device, HeadsetHalConstants.AT_RESPONSE_ERROR, 0);

            return;

        }



        Log.w(TAG, "Unhandled +ANDROID command: " + atString);

        return false;

        mNativeInterface.atResponseCode(device, HeadsetHalConstants.AT_RESPONSE_OK, 0);

    }



    private void processAndroidAtFeatureRequest(BluetoothDevice device) {

        /*

            replying with +ANDROID: (<feature1>, <feature2>, ...)

            currently we only support one type of feature: SINKAUDIOPOLICY

            replying with +ANDROID=1

            here, 1 is the feature id for audio policy



            currently we only support one type of feature

        */

        mNativeInterface.atResponseString(device,

                BluetoothHeadset.VENDOR_RESULT_CODE_COMMAND_ANDROID

                + ": (" + BluetoothSinkAudioPolicy.HFP_SET_SINK_AUDIO_POLICY_ID + ")");

                + ": " + HFP_SET_AUDIO_POLICY);

    }



    /**

     * Process AT+ANDROID=SINKAUDIOPOLICY AT command

     * Process AT+ANDROID AT command

     *

     * @param args command arguments after the equal sign

     * @param device Remote device that has sent this command

     * @return true on success, false on error

     */

    @VisibleForTesting

    boolean processAndroidAtSinkAudioPolicy(Object[] args, BluetoothDevice device) {

    private void processAndroidAtSetAudioPolicy(Object[] args, BluetoothDevice device) {

        if (args.length != 4) {

            Log.e(TAG, "processAndroidAtSinkAudioPolicy() args length must be 4: "

            Log.e(TAG, "processAndroidAtSetAudioPolicy() args length must be 4: "

                    + String.valueOf(args.length));

            return false;

            return;

        }

        if (!(args[1] instanceof Integer) || !(args[2] instanceof Integer)

                || !(args[3] instanceof Integer)) {

            Log.e(TAG, "processAndroidAtSinkAudioPolicy() argument types not matched");

            return false;

            Log.e(TAG, "processAndroidAtSetAudioPolicy() argument types not matched");

            return;

        }



        if (!mDevice.equals(device)) {

            Log.e(TAG, "processAndroidAtSinkAudioPolicy(): argument device " + device

            Log.e(TAG, "processAndroidAtSetAudioPolicy(): argument device " + device

                    + " doesn't match mDevice " + mDevice);

            return false;

            return;

        }



        int callEstablishPolicy = (Integer) args[1];
@@ -2059,7 +2058,6 @@ public class HeadsetStateMachine extends StateMachine { 
                .setActiveDevicePolicyAfterConnection(connectingTimePolicy)

                .setInBandRingtonePolicy(inbandPolicy)

                .build());

        return true;

    }



    /**
@@ -2131,9 +2129,6 @@ public class HeadsetStateMachine extends StateMachine { 
            processAtCpbs(atCommand.substring(5), commandType, device);

        } else if (atCommand.startsWith("+CPBR")) {

            processAtCpbr(atCommand.substring(5), commandType, device);

        } else if (atCommand.startsWith("+ANDROID")

                && checkAndProcessAndroidAt(atCommand, device)) {

            // Do nothing

        } else {

            processVendorSpecificAt(atCommand, device);

        }

android/app/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java

+5 −42
Original line number Diff line number Diff line
@@ -188,6 +188,8 @@ public class HeadsetClientStateMachine extends StateMachine { 


    private final boolean mClccPollDuringCall;



    private static final int CALL_AUDIO_POLICY_FEATURE_ID = 1;



    public int mAudioPolicyRemoteSupported;

    private BluetoothSinkAudioPolicy mHsClientAudioPolicy;

    private final int mConnectingTimePolicyProperty;
@@ -1215,15 +1217,14 @@ public class HeadsetClientStateMachine extends StateMachine { 
                            break;



                        case StackEvent.EVENT_TYPE_UNKNOWN_EVENT:

                            if (mVendorProcessor.isAndroidAtCommand(event.valueString)

                                    && processAndroidSlcCommand(event.valueString, event.device)) {

                            if (mVendorProcessor.processEvent(event.valueString, event.device)) {

                                mQueuedActions.poll();

                                transitionTo(mConnected);

                            } else {

                                Log.e(TAG, "Unknown event :" + event.valueString

                                        + " for device " + event.device);

                            }

                            break;



                        case StackEvent.EVENT_TYPE_SUBSCRIBER_INFO:

                        case StackEvent.EVENT_TYPE_CURRENT_CALLS:

                        case StackEvent.EVENT_TYPE_OPERATOR_NAME:
@@ -2026,44 +2027,6 @@ public class HeadsetClientStateMachine extends StateMachine { 
        HfpClientConnectionService.onAudioStateChanged(device, newState, prevState);

    }



    @VisibleForTesting

    boolean processAndroidSlcCommand(String atString, BluetoothDevice device) {

        if (!mCurrentDevice.equals(device) || atString.lastIndexOf("+ANDROID:") < 0) {

            return false;

        }



        // Check if it is +ANDROID: (<feature1>,...),(<feature2>, ...) the reply for AT+ANDROID=?

        while (true) {

            int indexUpperBucket = atString.indexOf("(");

            int indexLowerBucket = atString.indexOf(")");



            if (indexUpperBucket < 0 || indexLowerBucket < 0

                    || indexUpperBucket >= indexLowerBucket) {

                break;

            }

            String feature = atString.substring(indexUpperBucket + 1, indexLowerBucket);

            Log.d(TAG, "processAndroidSlcCommand: feature=[" + feature + "]");

            processAndroidAtFeature(feature.split(","));



            atString = atString.substring(indexLowerBucket + 1);

        }

        return true;

    }



    private void processAndroidAtFeature(String[] args) {

        if (args.length < 1) {

            Log.e(TAG, "processAndroidAtFeature: Invalid feature length");

            return;

        }



        String featureId = args[0];

        if (featureId.equals(BluetoothSinkAudioPolicy.HFP_SET_SINK_AUDIO_POLICY_ID)) {

            Log.i(TAG, "processAndroidAtFeature:"

                    + BluetoothSinkAudioPolicy.HFP_SET_SINK_AUDIO_POLICY_ID + " supported");

            setAudioPolicyRemoteSupported(true);

        }

    }



    // This method does not check for error condition (newState == prevState)

    private void broadcastConnectionState(BluetoothDevice device, int newState, int prevState) {

        logD("Connection state " + device + ": " + prevState + "->" + newState);
@@ -2263,7 +2226,7 @@ public class HeadsetClientStateMachine extends StateMachine { 


    private String createMaskString(BluetoothSinkAudioPolicy policies) {

        StringBuilder mask = new StringBuilder();

        mask.append(BluetoothSinkAudioPolicy.HFP_SET_SINK_AUDIO_POLICY_ID);

        mask.append(Integer.toString(CALL_AUDIO_POLICY_FEATURE_ID));

        mask.append("," + policies.getCallEstablishPolicy());

        mask.append("," + policies.getActiveDevicePolicyAfterConnection());

        mask.append("," + policies.getInBandRingtonePolicy());

android/app/src/com/android/bluetooth/hfpclient/VendorCommandResponseProcessor.java

+9 −20
Original line number Diff line number Diff line
@@ -127,7 +127,12 @@ class VendorCommandResponseProcessor { 
        return true;

    }



    private String getVendorIdFromAtCommand(String atString) {

    public boolean processEvent(String atString, BluetoothDevice device) {

        if (device == null) {

            Log.w(TAG, "processVendorEvent device is null");

            return false;

        }



        // Get event code

        int indexOfEqual = atString.indexOf('=');

        int indexOfColon = atString.indexOf(':');
@@ -143,29 +148,13 @@ class VendorCommandResponseProcessor { 
        // replace all white spaces

        eventCode = eventCode.replaceAll("\\s+", "");



        return eventCode;

    }



    public boolean isAndroidAtCommand(String atString) {

        String eventCode = getVendorIdFromAtCommand(atString);

        Integer vendorId = SUPPORTED_VENDOR_EVENTS.get(eventCode);

        if (vendorId == null) {

            return false;

        }

        return vendorId == BluetoothAssignedNumbers.GOOGLE;

    }



    public boolean processEvent(String atString, BluetoothDevice device) {

        if (device == null) {

            Log.w(TAG, "processVendorEvent device is null");

            return false;

        }



        String eventCode = getVendorIdFromAtCommand(atString);

        Integer vendorId = SUPPORTED_VENDOR_EVENTS.get(eventCode);

        if (vendorId == null) {

            Log.e(TAG, "Invalid response: " + atString + ". " + eventCode);

            return false;

        } else if (vendorId == BluetoothAssignedNumbers.GOOGLE) {

            Log.i(TAG, "received +ANDROID event. Setting Audio policy to true");

            mService.setAudioPolicyRemoteSupported(device, true);

        } else {

            broadcastVendorSpecificEventIntent(vendorId, eventCode, atString, device);

            logD("process vendor event " + vendorId + ", " + eventCode + ", "

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

+5 −105
Original line number Diff line number Diff line
@@ -1439,118 +1439,18 @@ public class HeadsetStateMachineTest { 
    /**

     * A test to validate received Android AT commands and processing

     */

    @Ignore("b/275668166")

    @Test

    public void testCheckAndProcessAndroidAt() {

        // Commands that will be handled

        Assert.assertTrue(mHeadsetStateMachine.checkAndProcessAndroidAt(

            "+ANDROID=?" , mTestDevice));

        verify(mNativeInterface, timeout(ASYNC_CALL_TIMEOUT_MILLIS).times(1)).atResponseCode(

                mTestDevice, HeadsetHalConstants.AT_RESPONSE_OK, 0);

        Assert.assertTrue(mHeadsetStateMachine.checkAndProcessAndroidAt(

            "+ANDROID=SINKAUDIOPOLICY,1,1,1" , mTestDevice));

        verify(mNativeInterface, timeout(ASYNC_CALL_TIMEOUT_MILLIS).times(2)).atResponseCode(

                mTestDevice, HeadsetHalConstants.AT_RESPONSE_OK, 0);

        Assert.assertTrue(mHeadsetStateMachine.checkAndProcessAndroidAt(

            "+ANDROID=SINKAUDIOPOLICY,100,100,100" , mTestDevice));

        verify(mNativeInterface, timeout(ASYNC_CALL_TIMEOUT_MILLIS).times(3)).atResponseCode(

                mTestDevice, HeadsetHalConstants.AT_RESPONSE_OK, 0);

        Assert.assertTrue(mHeadsetStateMachine.checkAndProcessAndroidAt(

            "+ANDROID=SINKAUDIOPOLICY,1,2,3,4,5" , mTestDevice));

        verify(mNativeInterface, timeout(ASYNC_CALL_TIMEOUT_MILLIS).times(1)).atResponseCode(

                mTestDevice, HeadsetHalConstants.AT_RESPONSE_ERROR, 0);



        // Commands with correct format but will not be handled

        Assert.assertFalse(mHeadsetStateMachine.checkAndProcessAndroidAt(

            "+ANDROID=" , mTestDevice));

        Assert.assertFalse(mHeadsetStateMachine.checkAndProcessAndroidAt(

            "+ANDROID: PROBE,1,\"`AB\"" , mTestDevice));

        Assert.assertFalse(mHeadsetStateMachine.checkAndProcessAndroidAt(

            "+ANDROID= PROBE,1,\"`AB\"" , mTestDevice));

        Assert.assertFalse(mHeadsetStateMachine.checkAndProcessAndroidAt(

            "AT+ANDROID=PROBE,1,1,\"PQGHRSBCTU__\"" , mTestDevice));



        // Incorrect format AT command

        Assert.assertFalse(mHeadsetStateMachine.checkAndProcessAndroidAt(

            "RANDOM FORMAT" , mTestDevice));



        // Check no any AT result was sent for the failed ones

        verify(mNativeInterface, timeout(ASYNC_CALL_TIMEOUT_MILLIS).times(3)).atResponseCode(

                mTestDevice, HeadsetHalConstants.AT_RESPONSE_OK, 0);

        verify(mNativeInterface, timeout(ASYNC_CALL_TIMEOUT_MILLIS).times(1)).atResponseCode(

                mTestDevice, HeadsetHalConstants.AT_RESPONSE_ERROR, 0);

    }



    @Test

    public void testCheckAndProcessAndroidAt_replyAndroidAtFeatureRequest() {

        // Commands that will be handled

        Assert.assertTrue(mHeadsetStateMachine.checkAndProcessAndroidAt(

            "+ANDROID=?" , mTestDevice));

        verify(mNativeInterface, timeout(ASYNC_CALL_TIMEOUT_MILLIS)).atResponseString(

                mTestDevice, "+ANDROID: (SINKAUDIOPOLICY)");

        verify(mNativeInterface, timeout(ASYNC_CALL_TIMEOUT_MILLIS)).atResponseCode(

                mTestDevice, HeadsetHalConstants.AT_RESPONSE_OK, 0);

    }



    /**

     * A end to end test to validate received Android AT commands and processing

     */

    @Test

    public void testCehckAndProcessAndroidAtFromStateMachine() {

        // setAudioPolicyMetadata is invoked in HeadsetStateMachine.init() so start from 1

        int expectCallTimes = 1;



        // setup Audio Policy Feature

    public void testProcessAndroidAt() {

        setUpConnectedState();



        // setup Audio Policy Feature

        setUpAudioPolicy();

        // receive and set android policy

        mHeadsetStateMachine.sendMessage(HeadsetStateMachine.STACK_EVENT,

                new HeadsetStackEvent(HeadsetStackEvent.EVENT_TYPE_UNKNOWN_AT,

                        "+ANDROID=SINKAUDIOPOLICY,1,1,1", mTestDevice));

        expectCallTimes++;

        verify(mDatabaseManager, timeout(ASYNC_CALL_TIMEOUT_MILLIS).times(expectCallTimes))

                        "+ANDROID=1,1,1,1", mTestDevice));

        verify(mDatabaseManager, timeout(ASYNC_CALL_TIMEOUT_MILLIS))

                .setAudioPolicyMetadata(anyObject(), anyObject());



        // receive and not set android policy

        mHeadsetStateMachine.sendMessage(HeadsetStateMachine.STACK_EVENT,

                new HeadsetStackEvent(HeadsetStackEvent.EVENT_TYPE_UNKNOWN_AT,

                        "AT+ANDROID=PROBE,1,1,\"PQGHRSBCTU__\"", mTestDevice));

        verify(mDatabaseManager, timeout(ASYNC_CALL_TIMEOUT_MILLIS).times(expectCallTimes))

                .setAudioPolicyMetadata(anyObject(), anyObject());

    }



    /**

     * A test to verify whether the sink audio policy command is valid

     */

    @Test

    public void testProcessAndroidAtSinkAudioPolicy() {

        // expected format

        Assert.assertTrue(setSinkAudioPolicyArgs("SINKAUDIOPOLICY,0,0,0", mTestDevice));

        Assert.assertTrue(setSinkAudioPolicyArgs("SINKAUDIOPOLICY,0,0,1", mTestDevice));

        Assert.assertTrue(setSinkAudioPolicyArgs("SINKAUDIOPOLICY,0,1,0", mTestDevice));

        Assert.assertTrue(setSinkAudioPolicyArgs("SINKAUDIOPOLICY,1,0,0", mTestDevice));

        Assert.assertTrue(setSinkAudioPolicyArgs("SINKAUDIOPOLICY,1,1,1", mTestDevice));



        // invalid format

        Assert.assertFalse(setSinkAudioPolicyArgs("SINKAUDIOPOLICY,0", mTestDevice));

        Assert.assertFalse(setSinkAudioPolicyArgs("SINKAUDIOPOLICY,0,0", mTestDevice));

        Assert.assertFalse(setSinkAudioPolicyArgs("SINKAUDIOPOLICY,0,0,0,0", mTestDevice));

        Assert.assertFalse(setSinkAudioPolicyArgs("SINKAUDIOPOLICY,NOT,INT,TYPE", mTestDevice));

        Assert.assertFalse(setSinkAudioPolicyArgs("RANDOM,VALUE-#$%,*(&^", mTestDevice));



        // wrong device

        BluetoothDevice device = mAdapter.getRemoteDevice("01:01:01:01:01:01");

        Assert.assertFalse(setSinkAudioPolicyArgs("SINKAUDIOPOLICY,0,0,0", device));

    }



    /**

     * set sink audio policy

     * @param arg body of the AT command

     * @return the result from processAndroidAtSinkAudioPolicy

     */

    private boolean setSinkAudioPolicyArgs(String arg, BluetoothDevice device) {

        Object[] args = HeadsetStateMachine.generateArgs(arg);

        return mHeadsetStateMachine.processAndroidAtSinkAudioPolicy(args, device);

    }



    /**

android/app/tests/unit/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachineTest.java

+14 −85

File changed.

Preview size limit exceeded, changes collapsed.