Merge "media_codecs: advertise vertical video support" into oc-mr1-dev
am: 1d1d6c0a8a

Change-Id: I1f3a3b10d123b89c7fb4aee1ce0b01e180172fad
diff --git a/init.bullhead.usb.rc b/init.bullhead.usb.rc
index e506c97..697f1da 100644
--- a/init.bullhead.usb.rc
+++ b/init.bullhead.usb.rc
@@ -38,6 +38,8 @@
     setprop sys.usb.mtp.device_type 3
     write /sys/class/android_usb/android0/f_ffs/aliases adb,mtp
 
+    setprop sys.usb.ffs.aio_compat 1
+
 on post-fs-data
     write /sys/module/rndis_ipa/parameters/min_cpu_freq 1036800
     write /sys/class/android_usb/android0/f_rndis_qc/rndis_transports BAM2BAM_IPA
diff --git a/init.recovery.bullhead.rc b/init.recovery.bullhead.rc
index 74ba632..d52f53e 100644
--- a/init.recovery.bullhead.rc
+++ b/init.recovery.bullhead.rc
@@ -5,3 +5,5 @@
     write /sys/devices/system/cpu/cpu3/cpufreq/scaling_max_freq 960000
     write /sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq 960000
     write /sys/devices/system/cpu/cpu5/cpufreq/scaling_max_freq 960000
+
+    setprop sys.usb.ffs.aio_compat 1
diff --git a/sepolicy/service_contexts b/sepolicy/service_contexts
index 13c8608..d18dd7a 100644
--- a/sepolicy/service_contexts
+++ b/sepolicy/service_contexts
@@ -1,3 +1,4 @@
 AtCmdFwd                                  u:object_r:atfwd_service:s0
 vendor.qcom.PeripheralManager             u:object_r:per_mgr_service:s0
 cneservice                                u:object_r:cne_service:s0
+display.qservice                          u:object_r:surfaceflinger_service:s0