From 91069d7b92d99cc53d65837b3258acb7c0cfbdb2 Mon Sep 17 00:00:00 2001
From: Rahul Sabnis <rahulsabnis@google.com>
Date: Fri, 14 Feb 2020 19:15:20 +0000
Subject: [PATCH] Revert "Ignore two broken tests"

This reverts commit 1958a27d2471fa66cfdeb5933bdc264956c480a5.

Reason for revert: Reverted CLs that caused the test failure

Change-Id: I93d7f1d4f95eb4982eff2f81b28b813c99f3b0ec
---
 .../AbstractBluetoothA2dpPreferenceControllerTest.java          | 2 --
 .../AbstractBluetoothDialogPreferenceControllerTest.java        | 2 --
 2 files changed, 4 deletions(-)

diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
index 772f9aea0c3..bc495f65886 100644
--- a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
@@ -38,7 +38,6 @@ import androidx.preference.PreferenceScreen;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -99,7 +98,6 @@ public class AbstractBluetoothA2dpPreferenceControllerTest {
     }
 
     @Test
-    @Ignore
     public void updateState_option2Set_shouldUpdateToOption2() {
         when(mBluetoothCodecConfig.getSampleRate()).thenReturn(
                 BluetoothCodecConfig.SAMPLE_RATE_48000);
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
index b2f4f9f2e9b..7ff179ee102 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
@@ -35,7 +35,6 @@ import com.android.settings.development.BluetoothA2dpConfigStore;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -102,7 +101,6 @@ public class AbstractBluetoothDialogPreferenceControllerTest {
     }
 
     @Test
-    @Ignore
     public void onIndexUpdated_checkFlow() {
         mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, null);
         when(mBluetoothA2dp.getCodecStatus(