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

Commit e8fe23e9 authored by Hyundo Moon's avatar Hyundo Moon Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cherrypicker-L92000000957720434:N15800001319641700"... 

Merge changes from topic "cherrypicker-L92000000957720434:N15800001319641700" into tm-qpr-dev am: fab5dcfe

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



Change-Id: I922a12699cf4dca7797ccf1a4009f4054111321a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 448f1dcd fab5dcfe

android/app/tests/unit/AndroidTest.xml

+3 −0
Original line number Diff line number Diff line
@@ -29,11 +29,14 @@ 
        <option name="run-command" value="cmd bluetooth_manager disable" />

        <option name="run-command" value="setprop bluetooth.profile.hfp.hf.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.pbap.client.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.map.client.enabled true" />

        <option name="teardown-command" value="cmd bluetooth_manager enable" />

        <option name="teardown-command" value="settings put global ble_scan_always_enabled 1" />

        <option name="teardown-command" value="setprop bluetooth.profile.hfp.hf.enabled false" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.pbap.client.enabled false" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.map.client.enabled false" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.FolderSaver">

        <option name="device-path" value="/data/vendor/ssrdump" />

android/app/tests/unit/GoogleAndroidTest.xml

+3 −0
Original line number Diff line number Diff line
@@ -29,10 +29,13 @@ 
        <option name="run-command" value="cmd bluetooth_manager disable" />

        <option name="run-command" value="setprop bluetooth.profile.hfp.hf.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.pbap.client.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.map.client.enabled true" />

        <option name="teardown-command" value="cmd bluetooth_manager enable" />

        <option name="teardown-command" value="settings put global ble_scan_always_enabled 1" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.pbap.client.enabled false" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.map.client.enabled false" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.FolderSaver">

        <option name="device-path" value="/data/vendor/ssrdump" />

android/app/tests/unit/src/com/android/bluetooth/mapclient/BmessageTest.java

+27 −0
Original line number Diff line number Diff line
@@ -93,4 +93,31 @@ public class BmessageTest { 
        Bmessage message = BmessageParser.createBmessage(NEGATIVE_LENGTH_MESSAGE);

        Assert.assertNull(message);

    }



    @Test

    public void setCharset() {

        Bmessage message = new Bmessage();



        message.setCharset("UTF-8");



        Assert.assertEquals(message.getCharset(), "UTF-8");

    }



    @Test

    public void setEncoding() {

        Bmessage message = new Bmessage();



        message.setEncoding("test_encoding");



        Assert.assertEquals(message.getEncoding(), "test_encoding");

    }



    @Test

    public void setStatus() {

        Bmessage message = new Bmessage();



        message.setStatus(Bmessage.Status.READ);



        Assert.assertEquals(message.getStatus(), Bmessage.Status.READ);

    }

}