Merge cherrypicks of ['googleplex-android-review.googlesource.com/39865694'] into 26Q2-release. Change-Id: If04407f2843598bd7e13e442ceddc644010ac862
diff --git a/tests/tests/telecom-cuj/src/android/telecom/cts/cuj/app/integration/CallSequencingBasicCallTest.java b/tests/tests/telecom-cuj/src/android/telecom/cts/cuj/app/integration/CallSequencingBasicCallTest.java index 960b3d7..cf667d3 100644 --- a/tests/tests/telecom-cuj/src/android/telecom/cts/cuj/app/integration/CallSequencingBasicCallTest.java +++ b/tests/tests/telecom-cuj/src/android/telecom/cts/cuj/app/integration/CallSequencingBasicCallTest.java
@@ -28,7 +28,6 @@ import static android.telecom.cts.apps.TelecomTestApp.ManagedConnectionServiceAppClone; import android.os.Bundle; -import android.platform.test.annotations.RequiresFlagsEnabled; import android.telecom.CallAttributes; import android.telecom.Connection; import android.telecom.DisconnectCause; @@ -37,8 +36,6 @@ import android.telecom.cts.cuj.BaseAppVerifier; import android.util.Log; -import com.android.server.telecom.flags.Flags; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -193,7 +190,6 @@ * B. */ @Test - @RequiresFlagsEnabled({Flags.FLAG_SELECT_PHONE_ACCOUNT_BEFORE_MAKING_ROOM}) public void testHoldAfterSelectPhoneAccount() throws Exception { if (!mShouldTestTelecom) { return;