commit d6e37e0705266e1d031450aab35c90ea9ad00b6d
author Michael Butler <butlermichael@google.com> Wed Apr 17 01:17:41 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 17 01:17:41 2019 +0000
tree 7619e2657344fcd657464a0c1c2bbefdb9bbf340
parent 47bfd2f01f70aeeffb0acbf38376fae7e63f5cd7
parent f1ca6754a86549fb2d84bbca43822fb91bc1ada2

Merge "Fix IBurstCallback.hal typo"

compatibility_matrices/Android.bp

diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp
index 5f56ee9..96b05c9 100644
--- a/compatibility_matrices/Android.bp
+++ b/compatibility_matrices/Android.bp
@@ -64,10 +64,10 @@
 }
 
 vintf_compatibility_matrix {
-    name: "framework_compatibility_matrix.current.xml",
-    stem: "compatibility_matrix.current.xml",
+    name: "framework_compatibility_matrix.4.xml",
+    stem: "compatibility_matrix.4.xml",
     srcs: [
-        "compatibility_matrix.current.xml",
+        "compatibility_matrix.4.xml",
     ],
     kernel_configs: [
         "kernel_config_current_4.9",

compatibility_matrices/Android.mk

diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk
index 425e376..b0caa7c 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -96,7 +96,7 @@
     framework_compatibility_matrix.1.xml \
     framework_compatibility_matrix.2.xml \
     framework_compatibility_matrix.3.xml \
-    framework_compatibility_matrix.current.xml \
+    framework_compatibility_matrix.4.xml \
     framework_compatibility_matrix.device.xml \
 
 my_framework_matrix_deps += \

compatibility_matrices/compatibility_matrix.4.xml

diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.4.xml
similarity index 97%
rename from compatibility_matrices/compatibility_matrix.current.xml
rename to compatibility_matrices/compatibility_matrix.4.xml
index 999c29c..a4e77cc 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.4.xml
@@ -80,14 +80,6 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
-        <name>android.hardware.bluetooth.a2dp</name>
-        <version>1.0</version>
-        <interface>
-            <name>IBluetoothAudioOffload</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
         <name>android.hardware.bluetooth.audio</name>
         <version>2.0</version>
         <interface>