Merge cherrypicks of ['googleplex-android-review.googlesource.com/23022110'] into tm-qpr3-release.
Change-Id: Iaf58c3d614d47fad8a3e7d6faf2af61f19e62016
diff --git a/android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
index 03ea3fa..52f2949 100644
--- a/android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
+++ b/android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
@@ -2096,8 +2096,6 @@
processAtCpbs(atCommand.substring(5), commandType, device);
} else if (atCommand.startsWith("+CPBR")) {
processAtCpbr(atCommand.substring(5), commandType, device);
- } else if (atCommand.startsWith("+ANDROID")) {
- processAndroidAt(atCommand, device);
} else {
processVendorSpecificAt(atCommand, device);
}
diff --git a/android/app/tests/unit/src/com/android/bluetooth/hfp/HeadsetStateMachineTest.java b/android/app/tests/unit/src/com/android/bluetooth/hfp/HeadsetStateMachineTest.java
index 025fe05..371f772 100644
--- a/android/app/tests/unit/src/com/android/bluetooth/hfp/HeadsetStateMachineTest.java
+++ b/android/app/tests/unit/src/com/android/bluetooth/hfp/HeadsetStateMachineTest.java
@@ -1444,6 +1444,7 @@
/**
* A test to validate received Android AT commands and processing
*/
+ @Ignore("b/275668166")
@Test
public void testProcessAndroidAt() {
setUpConnectedState();