Snap for 5892339 from bfaf73f7a87ee7b2b275d555f1af42bcb55abb8a to qt-qpr1-release

Change-Id: I6a774e960d47b4b3ceb54d76117006e7688d390d
diff --git a/cvq_ioctl.h b/cvq_ioctl.h
index fff94e4..e8777be 100644
--- a/cvq_ioctl.h
+++ b/cvq_ioctl.h
@@ -50,7 +50,7 @@
 #define SENSOR_PKG_ID           0
 #define SENSOR_PLUGIN_IDX       0
 #define SENSOR_INSTANCE_ID      9
-#define SENSOR_PRIORITY         1
+#define SENSOR_PRIORITY         2
 #define SENSOR_PRESENCE_MODE    0
 #define SENSOR_DETECTED_MODE    1
 #define SENSOR_MAX_MODE         2
@@ -60,6 +60,7 @@
 #define OSLO_EP_DISCONNECT      (0x205)
 #define CHRE_EP_DISCONNECT      (0x206)
 #define OSLO_BUF_INSTANCE_ID    8
+#define OSLO_BUF_PRIORITY       2
 
 #define AEC_PKG_ID       7
 #define AEC_PLUGIN_IDX   0
diff --git a/cvq_util.c b/cvq_util.c
index 9c80c0d..45f5230 100644
--- a/cvq_util.c
+++ b/cvq_util.c
@@ -1092,9 +1092,10 @@
     }
 
     // Create Buffer plugin
-    err = iaxxx_odsp_plugin_create(odsp_hdl, OSLO_BUF_INSTANCE_ID, BUF_PRIORITY,
-                                   BUF_PKG_ID, BUF_PLUGIN_IDX,
-                                   IAXXX_HMD_BLOCK_ID, PLUGIN_DEF_CONFIG_ID);
+    err = iaxxx_odsp_plugin_create(odsp_hdl, OSLO_BUF_INSTANCE_ID,
+                                   OSLO_BUF_PRIORITY, BUF_PKG_ID,
+                                   BUF_PLUGIN_IDX, IAXXX_HMD_BLOCK_ID,
+                                   PLUGIN_DEF_CONFIG_ID);
     if (err != 0) {
         ALOGE("%s: ERROR: Failed to create Sensor Buffer %d(%s)",
             __func__, errno, strerror(errno));