Snap for 7339742 from c6f7d94f22 to sc-v2-release

Change-Id: I8a98eb57f0b6902c62d97310e3446604150b31bb

audio/slider/config/mixer_paths.xml

@@ -487,6 +487,7 @@
     </path>
 
     <path name="audio-recordC bt-mic">
+        <ctl name="Audio Capture Mic Source" value="BT_MIC"/>
         <ctl name="EP1 TX Mixer BT_TX" value="1"/>
     </path>
 

audio/whitefin/config/mixer_paths.xml

@@ -563,6 +563,7 @@
     </path>
 
     <path name="audio-recordC bt-mic">
+        <ctl name="Audio Capture Mic Source" value="BT_MIC"/>
         <ctl name="EP1 TX Mixer BT_TX" value="1"/>
     </path>
 

conf/init.oriole.rc

@@ -1,8 +1,6 @@
 # Oriole specific init.rc
 import /vendor/etc/init/hw/init.gs101.rc
-
+import /vendor/etc/init/hw/init.raviole.rc
-on init && property:ro.build.flavor=factory_oriole-userdebug
-    import /vendor/etc/init/hw/init.factory.rc
 
 on init
     # logbuffer
@@ -11,33 +9,6 @@ on init
     chown system system /d/regmap/5-0036/registers
     chown system system /sys/bus/nvmem/devices/4-00500/nvmem
 
-on early-boot
-    # Wait for insmod_sh to finish all common modules
-    wait_for_prop vendor.common.modules.ready 1
-    start insmod_sh_oriole
-
-service insmod_sh_oriole /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.oriole.cfg
-    class main
-    user root
-    group root system
-    disabled
-    oneshot
-
-on fs
-    # Fingerprint
-    chown system system /dev/goodix_fp
-    exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g6.app
-
-    # Start the twoshay touch service
-    start twoshay
-
-    # LHBM
-    # FIXME(b/183223359): Only grant write access to SystemUI.
-    chmod 0666 /sys/class/drm/card0/card0-DSI-1/panel/backlight/panel0-backlight/local_hbm_mode
-
-on property:ro.revision=PROTO1.0
-    setprop persist.fingerprint.ghbm true
-
 # Toggle glove_mode according to touch_sensitivity_mode
 on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1
     write /sys/class/spi_master/spi11/spi11.0/glove_mode 00

conf/init.raven.rc

@@ -1,8 +1,6 @@
 # Raven specific init.rc
 import /vendor/etc/init/hw/init.gs101.rc
-
+import /vendor/etc/init/hw/init.raviole.rc
-on init && property:ro.build.flavor=factory_raven-userdebug
-    import /vendor/etc/init/hw/init.factory.rc
 
 on init
     # logbuffer
@@ -14,36 +12,10 @@ on init
     # Power Stats HAL
     chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats
 
-on early-boot
-    # Wait for insmod_sh to finish all common modules
-    wait_for_prop vendor.common.modules.ready 1
-    start insmod_sh_raven
-
-service insmod_sh_raven /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.raven.cfg
-    class main
-    user root
-    group root system
-    disabled
-    oneshot
-
 on fs
-    # Fingerprint
-    chown system system /dev/goodix_fp
-    exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g6.app
-
     # Face
     exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app
 
-    # LHBM
-    # FIXME(b/183223359): Only grant write access to SystemUI.
-    chmod 0666 /sys/class/drm/card0/card0-DSI-1/panel/backlight/panel0-backlight/local_hbm_mode
-
-    # Start the twoshay touch service
-    start twoshay
-
-on property:ro.revision=PROTO1.0
-    setprop persist.fingerprint.ghbm true
-
 on property:vendor.mfgapi.touchpanel.permission=1
     chmod 0600 /sys/devices/virtual/sec/tsp/cmd
     chown system system /sys/devices/virtual/sec/tsp/cmd

conf/init.raviole.rc

@@ -0,0 +1,31 @@
+# Raven/Oriole specific init.rc
+
+on init && property:ro.build.flavor=factory_${ro.hardware}-userdebug
+    import /vendor/etc/init/hw/init.factory.rc
+
+on early-boot
+    # Wait for insmod_sh to finish all common modules
+    wait_for_prop vendor.common.modules.ready 1
+    start insmod_sh_raviole
+
+service insmod_sh_raviole /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
+    class main
+    user root
+    group root system
+    disabled
+    oneshot
+
+on fs
+    # Fingerprint
+    chown system system /dev/goodix_fp
+    exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g6.app
+
+    # LHBM
+    # FIXME(b/183223359): Only grant write access to SystemUI.
+    chmod 0666 /sys/class/drm/card0/card0-DSI-1/panel/backlight/panel0-backlight/local_hbm_mode
+
+    # Start the twoshay touch service
+    start twoshay
+
+on property:ro.revision=PROTO1.0
+    setprop persist.fingerprint.ghbm true

device-oriole.mk

@@ -32,6 +32,7 @@ include hardware/google/pixel/vibrator/cs40l25/device.mk
 
 # Init files
 PRODUCT_COPY_FILES += \
+	device/google/raviole/conf/init.raviole.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.raviole.rc \
 	device/google/raviole/conf/init.oriole.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.oriole.rc
 
 # Recovery files

device-raven.mk

@@ -38,6 +38,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.enable_frame_rate_overr
 
 # Init files
 PRODUCT_COPY_FILES += \
+	device/google/raviole/conf/init.raviole.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.raviole.rc \
 	device/google/raviole/conf/init.raven.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.raven.rc
 
 # Recovery files

media_profiles_raven.xml

@@ -1216,7 +1216,7 @@
                    bitRate="22000000"
                    width="1920"
                    height="1080"
-                   frameRate="30" />
+                   frameRate="60" />
 
             <Audio codec="aac"
                    bitRate="96000"