commit b58c3ccdde61232a13e11d06487a7ce2c3572a45
author Scott Randolph <randolphs@google.com> Tue Sep 05 21:51:35 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 05 21:51:35 2017 +0000
tree 7c898089fdc71fb10a3bf49c453d8e5f4a572254
parent 0289fc42b4a6a1da25d9046b2f7bb085f1e80e8a
parent 065a085a3f972953461bf465a642ce0f186f8c7c

Merge "Add RINGTONE to Vehicle HAL AUDIO_FOCUS" into oc-mr1-dev

automotive/vehicle/2.0/types.hal

diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal
index 12b92dd..cb9b7ff 100644
--- a/automotive/vehicle/2.0/types.hal
+++ b/automotive/vehicle/2.0/types.hal
@@ -2224,6 +2224,9 @@
 
     /** Ext source is played. This is for tagging generic ext sources. */
     EXT_SOURCE_FLAG = 0x1000,
+
+    /** The phone ring tone is played */
+    RINGTONE_FLAG = 0x2000
 };
 
 /**

current.txt

diff --git a/current.txt b/current.txt
index c0dd0fa..a11886e 100644
--- a/current.txt
+++ b/current.txt
@@ -189,7 +189,7 @@
 
 # ABI preserving changes to HALs during Android O MR1 (Initial Set)
 
-05e0edf31db5b3ae19047d87059545cc2f836023edf8f9d969319e15e3485158 android.hardware.automotive.vehicle@2.0::types
+d4f2b9c1ec923de301c344d2fc52e54a7db0b0a01bb40f49d844b95394f09cc0 android.hardware.automotive.vehicle@2.0::types
 150a338ce11fcec70757c9675d83cf6a5d7b40d0c812741b91671fecce59eac9 android.hardware.broadcastradio@1.0::types
 dc7e6d4f537b9943e27edc4f86c5a03bb643b18f18f866f8c3c71c0ac4ea8cbc android.hardware.broadcastradio@1.0::types
 760485232f6cce07f8bb05e3475509956996b702f77415ee5bff05e2ec5a5bcc android.hardware.dumpstate@1.0::IDumpstateDevice