bathena: Update modules load in recovery

Change-Id: I810f0645adf1745e2c350bee2a11685da1ae4f5f

device.mk

@@ -37,7 +37,7 @@ PRODUCT_PACKAGES += \
 $(call soong_config_set,livedisplay_sysfs,enable_ab,true)
 
 # Moto Camera 2
-TARGET_MOTCAMERA2 := whitney
+TARGET_MOTCAMERA2 := nevis
 TARGET_USES_MOTCAMERA2 := true
 
 $(call inherit-product, vendor/motorola/MotCamera2/motcamera2.mk)

extract-files.py

@@ -42,11 +42,6 @@ blob_fixups: blob_fixups_user_type = {
         .binary_regex_replace(b'camera.mot.is.coming.cts', b'vendor.camera.coming.cts'),
     'vendor/lib64/libvidhance.so': blob_fixup()
         .add_needed('libcomparetf2_shim.so'),
-    (
-        'vendor/lib64/camera/components/com.qti.node.dewarp.so',
-        'vendor/lib64/camera/components/com.vidhance.node.processing.so',
-    ): blob_fixup()
-        .replace_needed('libui.so', 'libui-v34.so'),
 }  # fmt: skip
 
 extract_fns: extract_fns_user_type = {

init/fstab.qcom

@@ -7,13 +7,9 @@
 
 #<src>                                                 <mnt_point>               <type>  <mnt_flags and options>                            <fs_mgr_flags>
 system                                                  /system                  erofs   ro                                                   wait,slotselect,avb=vbmeta,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey,logical,first_stage_mount
-system                                                  /system                  ext4    ro                                                   wait,slotselect,avb=vbmeta,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey,logical,first_stage_mount
 system_ext                                              /system_ext              erofs   ro                                                   wait,slotselect,avb=vbmeta,logical,first_stage_mount
-system_ext                                              /system_ext              ext4    ro                                                   wait,slotselect,avb=vbmeta,logical,nofail,first_stage_mount
 product                                                 /product                 erofs   ro                                                   wait,slotselect,avb=vbmeta,logical,first_stage_mount
-product                                                 /product                 ext4    ro                                                   wait,slotselect,avb=vbmeta,logical,nofail,first_stage_mount
 vendor                                                  /vendor                  erofs   ro                                                   wait,slotselect,avb=vbmeta,logical,first_stage_mount
-vendor                                                  /vendor                  ext4    ro                                                   wait,slotselect,avb=vbmeta,logical,first_stage_mount
 /dev/block/by-name/metadata                             /metadata                ext4    noatime,nosuid,nodev,discard                         wait,formattable,first_stage_mount,check
 /dev/block/bootdevice/by-name/userdata                  /data                    f2fs    noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt            latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+emmc_optimized+wrappedkey_v0,metadata_encryption=aes-256-xts:wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=128M,sysfs_path=/sys/devices/platform/soc/4744000.sdhci,checkpoint=fs
 /devices/platform/soc/4784000.sdhci/mmc_host*           auto                     auto    defaults                                             wait,voldmanaged=sdcard1:auto

init/init.mmi.overlay.rc

@@ -20,11 +20,12 @@ on fs
     exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules sensors_class abov_sar_mmi_overlay audio_snd_soc_aw882xx
 
 on early-boot
-    # Goodix fingerprint
-    chown system system /dev/goodix_fp
-    chmod 0664 /dev/goodix_fp
-    mkdir /data/vendor/gf_data 0770 system system
-    mkdir /mnt/vendor/persist/goodix 0770 system system
+   # Goodix fingerprint
+   chown system system /dev/goodix_fp
+   chmod 0664 /dev/goodix_fp
+   chmod 0777 /proc/android_touch/debug
+   mkdir /data/vendor/gf_data 0770 system system
+   mkdir /mnt/vendor/persist/goodix 0770 system system
 
 service capsense_reset /system/vendor/bin/capsense_reset
     class core

modules.load.recovery

@@ -1,7 +1,13 @@
+chipone_tddi_mmi.ko
+exfat.ko
 focaltech_touch_spi_mmi.ko
 himax_v3_mmi_hx83102d.ko
 himax_v3_mmi.ko
 ili9882_mmi.ko
-chipone_tddi_mmi.ko
 nova_0flash_mmi.ko
-exfat.ko
+mmi_annotate.ko
+mmi_info.ko
+mmi_sys_temp.ko
+qpnp_adaptive_charge.ko
+qpnp-power-on-mmi.ko
+sensors_class.ko

proprietary-files.txt

@@ -253,6 +253,8 @@ vendor/firmware/novatek_ts_fw.bin
 vendor/firmware/novatek_ts_mp.bin
 
 # Touchscreen firmware (recovery)
+vendor/firmware/aw869x_haptic.bin:recovery/root/vendor/firmware/aw869x_haptic.bin
+vendor/firmware/aw869x_rtp.bin:recovery/root/vendor/firmware/aw869x_rtp.bin
 vendor/firmware/FOCAL_FW_HLT_FT8006S.bin:recovery/root/vendor/firmware/FOCAL_FW_HLT_FT8006S.bin
 vendor/firmware/ICNL9911.bin:recovery/root/vendor/firmware/ICNL9911.bin
 vendor/firmware/ILITEK_FW_HLT.hex:recovery/root/vendor/firmware/ILITEK_FW_HLT.hex
@@ -264,5 +266,9 @@ vendor/firmware/hlt_hx_criteria.csv:recovery/root/vendor/firmware/hlt_hx_criteri
 vendor/firmware/novatek_ts_fw.bin:recovery/root/vendor/firmware/novatek_ts_fw.bin
 vendor/firmware/novatek_ts_mp.bin:recovery/root/vendor/firmware/novatek_ts_mp.bin
 
+# Vibrator firmware
+vendor/firmware/aw869x_haptic.bin
+vendor/firmware/aw869x_rtp.bin
+
 # WiFi
 vendor/bin/cnss-daemon

resource-overlay/device/Frameworks/AndroidManifest.xml

@@ -4,8 +4,10 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="android.overlay.device">
-    <overlay android:targetPackage="android"
-             android:isStatic="true"
-             android:priority="300" />
+    package="android.overlay.device">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="300"
+        android:targetPackage="android" />
 </manifest>

resource-overlay/device/Frameworks/res/values/config.xml

@@ -1,28 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
+      SPDX-FileCopyrightText: 2009 The Android Open Source Project
+      SPDX-FileCopyrightText: The LineageOS Project
+      SPDX-License-Identifier: Apache-2.0
 -->
-<resources>
-    <!-- Vibrator pattern for feedback about a long screen/key press -->
-    <integer-array name="config_longPressVibePattern">
-        <item>0</item>
-        <item>43</item>
-    </integer-array>
 
-    <!-- Vibrator pattern for feedback about touching a virtual key -->
-    <integer-array name="config_virtualKeyVibePattern">
-        <item>0</item>
-        <item>43</item>
-    </integer-array>
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds.  Do not translate. -->
 
-    <!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->
-    <bool name="config_intrusiveNotificationLed">true</bool>
-
-    <!-- Screen brightness used to dim the screen when the user activity
-         timeout expires.  May be less than the minimum allowed brightness setting
-         that can be set by the user. -->
-    <integer name="config_screenBrightnessDim">4</integer>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <!-- Minimum allowable screen brightness to use in a very dark room.
          This value sets the floor for the darkest possible auto-brightness
@@ -33,6 +19,52 @@
          in darkness (although they may not be visible in a bright room). -->
     <integer name="config_screenBrightnessDark">2</integer>
 
+    <!-- Screen brightness used to dim the screen when the user activity
+         timeout expires.  May be less than the minimum allowed brightness setting
+         that can be set by the user. -->
+    <integer name="config_screenBrightnessDim">4</integer>
+
+    <!-- The default peak refresh rate for a given device. Change this value if you want to prevent
+         the framework from using higher refresh rates, even if display modes with higher refresh
+         rates are available from hardware composer. Only has an effect if the value is
+         non-zero. -->
+    <integer name="config_defaultPeakRefreshRate">60</integer>
+
+    <!-- Array of desired screen brightness in nits corresponding to the lux values
+         in the config_autoBrightnessLevels array. The display brightness is defined as the measured
+         brightness of an all-white image.
+
+         If this is defined then:
+            - config_autoBrightnessLcdBacklightValues should not be defined
+            - config_screenBrightnessNits must be defined
+            - config_screenBrightnessBacklight must be defined
+
+         This array should have size one greater than the size of the config_autoBrightnessLevels
+         array. The brightness values must be non-negative and non-decreasing. This must be
+         overridden in platform specific overlays -->
+    <integer-array name="config_autoBrightnessDisplayValuesNits">
+        <item>2</item>
+        <item>40</item>
+        <item>70</item>
+        <item>85</item>
+        <item>110</item>
+        <item>130</item>
+        <item>150</item>
+        <item>180</item>
+        <item>180</item>
+        <item>180</item>
+        <item>180</item>
+        <item>225</item>
+        <item>270</item>
+        <item>300</item>
+        <item>315</item>
+        <item>330</item>
+        <item>400</item>
+        <item>400</item>
+        <item>400</item>
+        <item>400</item>
+    </integer-array>
+
     <!-- Array of light sensor lux values to define our levels for auto backlight brightness support.
          The N entries of this array define N + 1 control points as follows:
          (1-based arrays)
@@ -75,41 +107,6 @@
         <item>8000</item>
     </integer-array>
 
-    <!-- Array of desired screen brightness in nits corresponding to the lux values
-         in the config_autoBrightnessLevels array. The display brightness is defined as the measured
-         brightness of an all-white image.
-
-         If this is defined then:
-            - config_autoBrightnessLcdBacklightValues should not be defined
-            - config_screenBrightnessNits must be defined
-            - config_screenBrightnessBacklight must be defined
-
-         This array should have size one greater than the size of the config_autoBrightnessLevels
-         array. The brightness values must be non-negative and non-decreasing. This must be
-         overridden in platform specific overlays -->
-    <array name="config_autoBrightnessDisplayValuesNits">
-        <item>2</item>
-        <item>40</item>
-        <item>70</item>
-        <item>85</item>
-        <item>110</item>
-        <item>130</item>
-        <item>150</item>
-        <item>180</item>
-        <item>180</item>
-        <item>180</item>
-        <item>180</item>
-        <item>225</item>
-        <item>270</item>
-        <item>300</item>
-        <item>315</item>
-        <item>330</item>
-        <item>400</item>
-        <item>400</item>
-        <item>400</item>
-        <item>400</item>
-    </array>
-
     <!-- An array describing the screen's backlight values corresponding to the brightness
          values in the config_screenBrightnessNits array.
 
@@ -139,7 +136,7 @@
          brightness modes but only the maximum brightness value obtainable in a sustainable manner.
 
          This array should be equal in size to config_screenBrightnessBacklight -->
-    <array name="config_screenBrightnessNits">
+    <integer-array name="config_screenBrightnessNits">
         <item>0</item>
         <item>2</item>
         <item>40</item>
@@ -155,16 +152,7 @@
         <item>315</item>
         <item>330</item>
         <item>400</item>
-    </array>
-
-    <!-- MMS user agent string -->
-    <string name="config_mms_user_agent" translatable="false">motoroladefy</string>
-
-    <!-- MMS user agent prolfile url -->
-    <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motov1/Profile/motov1.rdf</string>
-
-    <!-- Specify if the fingerprint hardware support gestures-->
-    <bool name="config_fingerprintSupportsGestures">true</bool>
+    </integer-array>
 
     <!-- The bounding path of the cutout region of the main built-in display.
          Must either be empty if there is no cutout region, or a string that is parsable by
@@ -198,12 +186,27 @@
         Z
     </string>
 
-    <!-- True if the device supports system navigation keys. -->
+    <!-- Vibrator pattern for feedback about a long screen/key press -->
+    <integer-array name="config_longPressVibePattern">
+        <item>0</item>
+        <item>43</item>
+    </integer-array>
+
+    <!-- Vibrator pattern for feedback about touching a virtual key -->
+    <integer-array name="config_virtualKeyVibePattern">
+        <item>0</item>
+        <item>43</item>
+    </integer-array>
+
+    <!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->
+    <bool name="config_intrusiveNotificationLed">true</bool>
+
+    <!-- Specify if the fingerprint hardware support gestures-->
+    <bool name="config_fingerprintSupportsGestures">true</bool>
+
+    <!-- Enable system navigation keys. -->
     <bool name="config_supportSystemNavigationKeys">true</bool>
 
-    <!-- The default peak refresh rate for a given device. Change this value if you want to prevent
-         the framework from using higher refresh rates, even if display modes with higher refresh
-         rates are available from hardware composer. Only has an effect if the value is
-         non-zero. -->
-    <integer name="config_defaultPeakRefreshRate">60</integer>
+    <!-- MMS user agent string -->
+    <string name="config_mms_user_agent" translatable="false">motoroladefy</string>
 </resources>

resource-overlay/device/Frameworks/res/values/dimens.xml

@@ -1,9 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
+      SPDX-FileCopyrightText: 2009 The Android Open Source Project
+      SPDX-FileCopyrightText: The LineageOS Project
+      SPDX-License-Identifier: Apache-2.0
 -->
-<resources>
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds.  Do not translate. -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Default radius of the software rounded corners. -->
+    <dimen name="rounded_corner_radius">68.0px</dimen>
+
+    <!-- Default paddings for content around the corners. -->
+    <dimen name="rounded_corner_content_padding">20dp</dimen>
+
     <!-- The default height of the status bar used in {@link SystemBarUtils#getStatusBarHeight} to
          calculate the status bar height. -->
     <dimen name="status_bar_height_default">28dp</dimen>
@@ -17,10 +29,4 @@
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
     <dimen name="status_bar_height_landscape">28dp</dimen>
-
-    <!-- Default radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">68.0px</dimen>
-
-    <!-- Default paddings for content around the corners. -->
-    <dimen name="rounded_corner_content_padding">20dp</dimen>
 </resources>

resource-overlay/device/Frameworks/res/xml/power_profile.xml

@@ -5,8 +5,8 @@
 -->
 <device name="Android">
     <item name="none">0</item>
-    <item name="screen.on.display0">88.97</item>
-    <item name="screen.full.display0">325.02</item>
+    <item name="screen.on">88.97</item>
+    <item name="screen.full">325.02</item>
     <item name="wifi.on">3.01</item>
     <item name="wifi.active">78.83</item>
     <item name="wifi.scan">78.45</item>

resource-overlay/device/LineagePlatform/AndroidManifest.xml

@@ -4,8 +4,10 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="lineageos.platform.overlay.device">
-    <overlay android:targetPackage="lineageos.platform"
-             android:isStatic="true"
-             android:priority="800" />
+    package="lineageos.platform.overlay.device">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="800"
+        android:targetPackage="lineageos.platform" />
 </manifest>

resource-overlay/device/LineagePlatform/res/values/config.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
+      SPDX-FileCopyrightText: 2015-2016 The CyanogenMod Project
+      SPDX-FileCopyrightText: The LineageOS Project
+      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
     <!-- All the capabilities of the LEDs on this device, stored as a bit field.

resource-overlay/device/SystemUI/AndroidManifest.xml

@@ -4,7 +4,9 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.systemui.overlay.device">
-    <overlay android:targetPackage="com.android.systemui"
-             android:isStatic="true" />
+    package="com.android.systemui.overlay.device">
+
+    <overlay
+        android:isStatic="true"
+        android:targetPackage="com.android.systemui" />
 </manifest>

resource-overlay/device/SystemUI/res/values/config.xml

@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+     SPDX-FileCopyrightText: 2009 The Android Open Source Project
      SPDX-FileCopyrightText: The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
-<resources>
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds.  Do not translate. -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
     <!-- Doze: does this device support STATE_DOZE?  -->
     <bool name="doze_display_state_supported">true</bool>
+
 </resources>

resource-overlay/device/SystemUI/res/values/dimens.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+     SPDX-FileCopyrightText: 2009 The Android Open Source Project
      SPDX-FileCopyrightText: The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
+
 <resources>
     <!-- Height of the status bar header bar when on Keyguard -->
     <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>

resource-overlay/device/Wifi/AndroidManifest.xml

@@ -4,8 +4,11 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.wifi.resources.overlay.device">
-    <overlay android:targetPackage="com.android.wifi.resources"
-             android:isStatic="true"
-             android:priority="800" />
+    package="com.android.wifi.resources.overlay.device">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="800"
+        android:targetName="WifiCustomization"
+        android:targetPackage="com.android.wifi.resources" />
 </manifest>