commit 083b857741a05d37ca2104cc54924dc4065dcd22
author Steven Laver <lavers@google.com> Fri Sep 27 14:07:33 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 27 14:07:33 2019 +0000
tree e7ec92209e64fe34c577335c099fcf94cd86b2e2
parent 70de8973682742cc5105410e9113c7aed20101a8
parent 72993e109ad327034897bcde5eb962656ae170b2

Merge "Apply the new A2DP codec config only when passed the check with codec status" into q-keystone-qcom-dev

src/com/android/bluetooth/hfp/HeadsetStateMachine.java

diff --git a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
index 4e82d84..cfa43a7 100644
--- a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
+++ b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
@@ -41,6 +41,7 @@
 import android.net.NetworkInfo;
 import android.net.Network;
 import android.util.StatsLog;
+import android.os.Build;
 
 import com.android.bluetooth.btservice.AdapterService;
 import com.android.bluetooth.btservice.ProfileService;
@@ -2629,6 +2630,10 @@
             processAtCpbr(atCommand.substring(5), commandType, device);
         } else if (atCommand.startsWith("+CSQ")) {
             mNativeInterface.atResponseCode(device, HeadsetHalConstants.AT_RESPONSE_ERROR, 0);
+        } else if (atCommand.equals("+CGMI")) {
+            mNativeInterface.atResponseString(device, "+CGMI: \"" + Build.MANUFACTURER + "\"");
+        } else if (atCommand.equals("+CGMM")) {
+            mNativeInterface.atResponseString(device, "+CGMM: " + Build.MODEL);
         } else {
             processVendorSpecificAt(atCommand, device);
         }