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

Commit 847c9f71 authored by David Duarte's avatar David Duarte
Browse files

[conflict] Revert "RESTRICT AUTOMERGE Disable GoogleBluetoothInstrumentation test" am: 1c5aa09b 

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



Change-Id: I440769272d4ef2293657b1ea622af9eb072494b2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c3ca123c 1c5aa09b

TEST_MAPPING

+12 −12
Original line number Diff line number Diff line
@@ -8,12 +8,12 @@ 
      "name": "BluetoothInstrumentationTests",

      "keywords": ["internal"]

    },

    //{

    //  "name": "GoogleBluetoothInstrumentationTests"

    //},

    //{

    //  "name": "FrameworkBluetoothTests"

    //},

    {

      "name": "GoogleBluetoothInstrumentationTests"

    },

    {

      "name": "FrameworkBluetoothTests"

    },

    {

      "name": "ServiceBluetoothTests"

    },
@@ -275,12 +275,12 @@ 
    {

      "name": "BluetoothInstrumentationTests"

    },

    //{

    //  "name": "GoogleBluetoothInstrumentationTests"

    //},

    //{

    //  "name": "FrameworkBluetoothTests"

    //},

    {

      "name": "GoogleBluetoothInstrumentationTests"

    },

    {

      "name": "FrameworkBluetoothTests"

    },

    {

      "name": "ServiceBluetoothTests"

    },