sdm660: Treewide: Cleanup and Reorder

* Remove Double Definition
* Reordeder Alphabetic
* Move Audio and Media Files to Configs
* Move Wifi Configuration to Configs
* Cleanup Overlay and Reorder
* Move Privapp Permission to new Folder
* Reorder Properties and rename mk
* Move Xiaomi Doze to new Folder

BoardConfigCommon.mk

@@ -22,20 +22,14 @@
 # definition file).
 #
 
+# Common Tree Path
 COMMON_PATH := device/xiaomi/sdm660-common
 
-BOARD_VENDOR := xiaomi
+# ANT+
+BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
 
-# Use Snapdragon LLVM, if available
+# APEX image
-TARGET_USE_SDCLANG := true
+DEXPREOPT_GENERATE_APEX_IMAGE := true
-
-# Bootloader
-TARGET_BOOTLOADER_BOARD_NAME := sdm660
-TARGET_NO_BOOTLOADER := true
-
-# Platform
-TARGET_BOARD_PLATFORM := sdm660
-TARGET_BOARD_PLATFORM_GPU := qcom-adreno512
 
 # Architecture
 TARGET_ARCH := arm64
@@ -44,40 +38,13 @@ TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_ABI2 :=
 TARGET_CPU_VARIANT := kryo
 
+# Architecture 2
 TARGET_2ND_ARCH := arm
 TARGET_2ND_ARCH_VARIANT := armv8-a
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
 TARGET_2ND_CPU_VARIANT := kryo
 
-TARGET_USES_64_BIT_BINDER := true
-BUILD_BROKEN_DUP_RULES := true
-BUILD_BROKEN_PHONY_TARGETS := true
-
-# Kernel
-BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 earlycon=msm_serial_dm,0xc170000 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 androidboot.configfs=true androidboot.usbcontroller=a800000.dwc3
-BOARD_KERNEL_CMDLINE += loop.max_part=7
-BOARD_KERNEL_BASE := 0x00000000
-BOARD_KERNEL_PAGESIZE := 4096
-BOARD_KERNEL_TAGS_OFFSET := 0x00000100
-BOARD_RAMDISK_OFFSET     := 0x01000000
-BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb
-TARGET_KERNEL_ARCH := arm64
-TARGET_KERNEL_HEADER_ARCH := arm64
-TARGET_KERNEL_VERSION := 4.4
-TARGET_KERNEL_CLANG_COMPILE := true
-TARGET_KERNEL_CLANG_VERSION := r353983c
-
-# QCOM hardware
-BOARD_USES_QCOM_HARDWARE := true
-TARGET_USES_QCOM_BSP := false
-
-# ANT+
-BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
-
-# APEX image
-DEXPREOPT_GENERATE_APEX_IMAGE := true
-
 # Audio
 BOARD_USES_ALSA_AUDIO := true
 USE_CUSTOM_AUDIO_POLICY := 1
@@ -86,6 +53,9 @@ BOARD_SUPPORTS_SOUND_TRIGGER_HAL := true
 AUDIO_USE_DEEP_AS_PRIMARY_OUTPUT := false
 AUDIO_DISABLE_SWAP_CHANNELS := true
 
+# Binder
+TARGET_USES_64_BIT_BINDER := true
+
 # Bluetooth
 BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_QCOM := true
@@ -96,6 +66,19 @@ QCOM_BT_USE_BTNV := true
 QCOM_BT_USE_SMD_TTY := true
 TARGET_USE_QTI_BT_STACK := true
 
+# Bootloader
+TARGET_BOOTLOADER_BOARD_NAME := sdm660
+TARGET_NO_BOOTLOADER := true
+
+# Board
+TARGET_BOARD_PLATFORM := sdm660
+TARGET_BOARD_PLATFORM_GPU := qcom-adreno512
+BOARD_VENDOR := xiaomi
+
+# Build Rules
+BUILD_BROKEN_DUP_RULES := true
+BUILD_BROKEN_PHONY_TARGETS := true
+
 # Camera
 USE_DEVICE_SPECIFIC_CAMERA := true
 TARGET_USES_QTI_CAMERA_DEVICE := true
@@ -108,9 +91,16 @@ BOARD_CHARGER_ENABLE_SUSPEND := true
 BOARD_CHARGER_DISABLE_INIT_BLANK := true
 HEALTHD_USE_BATTERY_INFO := true
 
+# Clang
+TARGET_KERNEL_CLANG_COMPILE := true
+TARGET_KERNEL_CLANG_VERSION := r353983c
+
 # CNE and DPM
 BOARD_USES_QCNE := true
 
+# ConfigFS
+TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/configs/config.fs
+
 # Crypto
 TARGET_HW_DISK_ENCRYPTION := true
 
@@ -123,7 +113,7 @@ TARGET_USES_ION := true
 # DRM
 TARGET_ENABLE_MEDIADRM_64 := true
 
-# Enable dexpreopt to speed boot time
+# Dexpreopt
 ifeq ($(HOST_OS),linux)
   ifneq ($(TARGET_BUILD_VARIANT),eng)
     ifeq ($(WITH_DEXPREOPT),)
@@ -169,7 +159,19 @@ TARGET_RECOVERY_DEVICE_MODULES := libinit_sdm660
 USE_DEVICE_SPECIFIC_DATA_IPA_CFG_MGR := true
 USE_DEVICE_SPECIFIC_IPACFG_MGR := true
 
-# Keystore
+# Kernel
+BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 earlycon=msm_serial_dm,0xc170000 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 androidboot.configfs=true androidboot.usbcontroller=a800000.dwc3
+BOARD_KERNEL_CMDLINE += loop.max_part=7
+BOARD_KERNEL_BASE := 0x00000000
+BOARD_KERNEL_PAGESIZE := 4096
+BOARD_KERNEL_TAGS_OFFSET := 0x00000100
+BOARD_RAMDISK_OFFSET     := 0x01000000
+BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb
+TARGET_KERNEL_ARCH := arm64
+TARGET_KERNEL_HEADER_ARCH := arm64
+TARGET_KERNEL_VERSION := 4.4
+
+# Keymaster
 TARGET_PROVIDES_KEYMASTER := true
 
 # Partitions
@@ -184,23 +186,19 @@ BOARD_SYSTEMIMAGE_PARTITION_TYPE := ext4
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
 BOARD_VENDORIMAGE_PARTITION_SIZE := 2147483648
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_USERIMAGES_USE_EXT4 := true
+TARGET_USERIMAGES_USE_F2FS := true
 
-TARGET_EXFAT_DRIVER := exfat
+# Extra Symlink
-
 BOARD_ROOT_EXTRA_SYMLINKS := \
     /vendor/dsp:/dsp \
     /vendor/firmware_mnt:/firmware \
     /vendor/bt_firmware:/bt_firmware \
     /mnt/vendor/persist:/persist
 
+# Directory
 TARGET_COPY_OUT_PRODUCT := system/product
 TARGET_COPY_OUT_VENDOR := vendor
-TARGET_USERIMAGES_USE_EXT4 := true
-TARGET_USERIMAGES_USE_F2FS := true
-
-TARGET_USES_MKE2FS := true
-
-TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs
 
 # Peripheral manager
 TARGET_PER_MGR_ENABLED := true
@@ -211,6 +209,10 @@ TARGET_USES_INTERACTION_BOOST := true
 # Properties
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 
+# QCOM hardware
+BOARD_USES_QCOM_HARDWARE := true
+TARGET_USES_QCOM_BSP := false
+
 # Recovery
 ifneq ($(filter lavender,$(TARGET_DEVICE)),)
 TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab_A.qcom
@@ -225,11 +227,12 @@ BOARD_HAS_LARGE_FILESYSTEM := true
 OVERRIDE_RS_DRIVER := libRSDriver_adreno.so
 
 # RIL
-TARGET_PROVIDES_QTI_TELEPHONY_JAR := true
 PROTOBUF_SUPPORTED := true
+TARGET_PROVIDES_QTI_TELEPHONY_JAR := true
+TARGET_USES_ALTERNATIVE_MANUAL_NETWORK_SELECT := true
 
-# Timeservice
+# SDCLANG
-BOARD_USES_QC_TIME_SERVICES := true
+TARGET_USE_SDCLANG := true
 
 # SELinux
 include device/qcom/sepolicy-legacy-um/sepolicy.mk
@@ -237,15 +240,9 @@ BOARD_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
 BOARD_PLAT_PUBLIC_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/public
 BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/private
 
-# Telephony
-TARGET_USES_ALTERNATIVE_MANUAL_NETWORK_SELECT := true
-
 # Treble
-BOARD_VNDK_VERSION := current
-BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 PRODUCT_FULL_TREBLE_OVERRIDE := true
 PRODUCT_VENDOR_MOVE_ENABLED := true
-PRODUCT_EXTRA_VNDK_VERSIONS := 28
 
 # Timeservice
 BOARD_USES_QC_TIME_SERVICES := true
@@ -253,6 +250,10 @@ BOARD_USES_QC_TIME_SERVICES := true
 # Use mke2fs to create ext4 images
 TARGET_USES_MKE2FS := true
 
+# VNDK
+BOARD_VNDK_VERSION := current
+PRODUCT_EXTRA_VNDK_VERSIONS := 28
+
 # Wifi
 BOARD_USES_AOSP_WLAN_HAL := true
 BOARD_HAS_QCOM_WLAN := true

common_prop.mk

@@ -3,12 +3,12 @@ BUILD_FINGERPRINT := "xiaomi/wayne/wayne:8.1.0/OPM1.171019.011/V9.5.11.0.ODCCNFA
 
 # ART
 PRODUCT_PROPERTY_OVERRIDES += \
-    dalvik.vm.dex2oat-filter=speed \
-    dalvik.vm.image-dex2oat-filter=speed \
-    ro.vendor.qti.am.reschedule_service=true \
-    ro.sys.fw.dex2oat_thread_count=8 \
     dalvik.vm.boot-dex2oat-threads=8 \
-    dalvik.vm.dex2oat-threads=8
+    dalvik.vm.dex2oat-filter=speed \
+    dalvik.vm.dex2oat-threads=8 \
+    dalvik.vm.image-dex2oat-filter=speed \
+    ro.sys.fw.dex2oat_thread_count=8 \
+    ro.vendor.qti.am.reschedule_service=true
 
 # Audio
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -16,8 +16,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
     audio.deep_buffer.media=true \
     audio.offload.min.duration.secs=30 \
     audio.offload.video=true \
-		audio.safemedia.bypass=true \
+    audio.safemedia.bypass=true \
-    vendor.audio.volume.headset.gain.depcal=true \
+    audio.sys.noisy.broadcast.delay=600 \
+    audio.sys.offload.pstimeout.secs=3 \
     persist.dirac.acs.controller=qem \
     persist.dirac.acs.ignore_error=1 \
     persist.dirac.acs.storeSettings=1 \
@@ -37,31 +38,31 @@ PRODUCT_PROPERTY_OVERRIDES += \
     vendor.audio.dolby.ds2.enabled=false \
     vendor.audio.dolby.ds2.hardbypass=false \
     vendor.audio.flac.sw.decoder.24bit=true \
+    vendor.audio_hal.period_size=192 \
     vendor.audio.hw.aac.encoder=true \
-    audio.sys.noisy.broadcast.delay=600 \
     vendor.audio.offload.buffer.size.kb=64 \
     vendor.audio.offload.gapless.enabled=true \
     vendor.audio.offload.multiaac.enable=true \
     vendor.audio.offload.multiple.enabled=false \
     vendor.audio.offload.passthrough=false \
-    audio.sys.offload.pstimeout.secs=3 \
     vendor.audio.offload.track.enable=false \
     vendor.audio.parser.ip.buffer.size=262144 \
     vendor.audio.safx.pbe.enabled=false \
+    vendor.audio.snd_card.open.retries=50 \
     vendor.audio.tunnel.encode=false \
     vendor.audio.use.sw.alac.decoder=true \
     vendor.audio.use.sw.ape.decoder=true \
-    vendor.audio.snd_card.open.retries=50 \
+    vendor.audio.spkr_prot.tx.sampling_rate=48000 \
-    vendor.audio_hal.period_size=192 \
+    vendor.audio.volume.headset.gain.depcal=true \
-    vendor.audio.spkr_prot.tx.sampling_rate=48000\
     vendor.fm.a2dp.conc.disabled=true \
     vendor.voice.path.for.pcm.voip=true
 
 # Audio Feature
-    PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_PROPERTY_OVERRIDES += \
     vendor.audio.feature.a2dp_offload.enable=false \
     vendor.audio.feature.afe_proxy.enable=true \
     vendor.audio.feature.anc_headset.enable=true \
+    vendor.audio.feature.audiozoom.enable=false \
     vendor.audio.feature.battery_listener.enable=false \
     vendor.audio.feature.compr_cap.enable=false \
     vendor.audio.feature.compress_in.enable=false \
@@ -69,6 +70,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
     vendor.audio.feature.compr_voip.enable=true \
     vendor.audio.feature.concurrent_capture.enable=false \
     vendor.audio.feature.custom_stereo.enable=true \
+    vendor.audio.feature.deepbuffer_as_primary.enable=false \
     vendor.audio.feature.display_port.enable=false \
     vendor.audio.feature.dsm_feedback.enable=false \
     vendor.audio.feature.dynamic_ecns.enable=false \
@@ -90,37 +92,35 @@ PRODUCT_PROPERTY_OVERRIDES += \
     vendor.audio.feature.maxx_audio.enable=false \
     vendor.audio.feature.ras.enable=false \
     vendor.audio.feature.record_play_concurency.enable=false \
+    vendor.audio.feature.snd_mon.enable=false \
     vendor.audio.feature.src_trkn.enable=true \
     vendor.audio.feature.spkr_prot.enable=false \
     vendor.audio.feature.ssrec.enable=false \
     vendor.audio.feature.usb_offload.enable=false \
     vendor.audio.feature.usb_offload_burst_mode.enable=false \
     vendor.audio.feature.usb_offload_sidetone_volume.enable=false \
-    vendor.audio.feature.deepbuffer_as_primary.enable=false \
     vendor.audio.feature.vbat.enable=true \
-    vendor.audio.feature.wsa.enable=true \
+    vendor.audio.feature.wsa.enable=true
-    vendor.audio.feature.audiozoom.enable=false \
-    vendor.audio.feature.snd_mon.enable=false
 
 # Bluetooth
 PRODUCT_PROPERTY_OVERRIDES += \
-    vendor.qcom.bluetooth.soc=cherokee \
-    persist.bluetooth.bluetooth_audio_hal.disabled=false \
-    ro.vendor.bluetooth.wipower=false \
     persist.bluetooth.a2dp_offload.disabled=false \
-		persist.vendor.qcom.bluetooth.enable.splita2dp=false \
+    persist.bluetooth.bluetooth_audio_hal.disabled=false \
     persist.vendor.bt.a2dp_offload_cap=sbc-aac-aptx-aptxhd-ldac \
-    persist.vendor.bt.aac_frm_ctl.enabled=true
+    persist.vendor.bt.aac_frm_ctl.enabled=true \
+    persist.vendor.qcom.bluetooth.enable.splita2dp=false \
+    ro.vendor.bluetooth.wipower=false \
+    vendor.qcom.bluetooth.soc=cherokee
 
 # Camera
 PRODUCT_PROPERTY_OVERRIDES += \
     camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera,com.qualcomm.qti.qmmi \
+    persist.camera.privapp.list=org.codeaurora.snapcam \
     persist.vendor.camera.HAL3.enabled=1 \
     persist.vendor.camera.eis.enable=1 \
     persist.vendor.camera.exif.make=Xiaomi \
-    vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera,com.qualcomm.qti.qmmi \
     persist.vendor.camera.privapp.list=org.codeaurora.snapcam \
-    persist.camera.privapp.list=org.codeaurora.snapcam
+    vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera,com.qualcomm.qti.qmmi \
 
 # Codec2 switch
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -155,8 +155,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
     vendor.display.disable_skip_validate=1 \
     vendor.gralloc.enable_fb_ubwc=1 \
     vendor.video.disable.ubwc=1 \
-    video.disable.ubwc=1 \
+    vendor.display.enable_default_color_mode=0 \
-    vendor.display.enable_default_color_mode=0
+    video.disable.ubwc=1
 
 # The default sf phase offset is set to 6ms, to avoid it be included into next
 # vsync threshold, set high fps early sf and next vsync threshold phase offset
@@ -166,7 +166,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
     debug.sf.high_fps_early_gl_phase_offset_ns=9000000 \
     debug.sf.phase_offset_threshold_for_next_vsync_ns=6100000
 
-# enable FIFO scheduling for UI and Render threads by default
+# FIFO scheduling for UI
 PRODUCT_PROPERTY_OVERRIDES += \
     sys.use_fifo_ui=1
 
@@ -260,27 +260,27 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.radio.apm_sim_not_pwdn=1 \
     persist.vendor.radio.atfwd.start=true \
     persist.vendor.radio.custom_ecc=1 \
+    persist.vendor.radio.data_con_rprt=1 \
+    persist.vendor.radio.data_ltd_sys_ind=1 \
+    persist.vendor.radio.flexmap_type=none \
     persist.vendor.radio.rat_on=combine \
     persist.vendor.radio.sib16_support=1 \
     persist.vendor.radio.procedure_bytes=SKIP \
-    persist.vendor.radio.flexmap_type=none \
     ril.subscription.types=NV,RUIM \
     rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so \
     ro.telephony.default_network=22,20 \
+    ro.telephony.iwlan_operation_mode=legacy \
     ro.vendor.use_data_netmgrd=true \
-    telephony.lteOnCdmaDevice=1 \
+    telephony.lteOnCdmaDevice=1
-    persist.vendor.radio.data_ltd_sys_ind=1 \
-    persist.vendor.radio.data_con_rprt=1 \
-    ro.telephony.iwlan_operation_mode=legacy
 
 # Rendering
 PRODUCT_PROPERTY_OVERRIDES += \
-    debug.enable.sglscale=1 \
     debug.egl.hw=1 \
+    debug.enable.sglscale=1 \
     debug.sf.disable_hwc=0 \
+    debug.sf.gpu_comp_tiling=1 \
     debug.sf.recomputecrop=0 \
-    persist.hwc.ptor.enable=true \
+    persist.hwc.ptor.enable=true
-    debug.sf.gpu_comp_tiling=1
 
 # Sensor
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -294,9 +294,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # SurfaceFlinger
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
-    ro.surface_flinger.protected_contents=true \
     ro.surface_flinger.force_hwc_copy_for_virtual_displays=true \
     ro.surface_flinger.max_virtual_display_dimension=4096 \
+    ro.surface_flinger.protected_contents=true \
     ro.surface_flinger.vsync_event_phase_offset_ns=2000000 \
     ro.surface_flinger.vsync_sf_event_phase_offset_ns=6000000
 

overlay-lineage/frameworks/base/core/res/res/values/config.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <integer name="config_buttonBrightnessSettingDefault">0</integer>
-
-    <!-- Display mode remapping table.
-         If the mode names returned by the backend do not match
-         the predefined and translated strings in the Settings
-         app, they can be remapped here. The format is
-         "oldname:newname", one per entry. -->
-    <string-array name="config_displayModeMappings" translatable="false">
-        <item>A_Standard:standard</item>
-        <item>B_Warm mode:reading</item>
-        <item>D_Cold mode:dynamic</item>
-    </string-array>
-
-    <!-- Should we filter any display modes which are unampped? -->
-    <bool name="config_filterDisplayModes">true</bool>
-</resources>

overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml

@@ -14,11 +14,6 @@
      limitations under the License.
 -->
 <resources>
-    <!-- Default value for proximity check on screen wake
-     NOTE ! - Enable for devices that have a fast response proximity sensor (ideally < 300ms)-->
-    <bool name="config_proximityCheckOnWake">true</bool>
-    <bool name="config_proximityCheckOnWakeEnabledByDefault">true</bool>
-
     <!-- All the capabilities of the LEDs on this device, stored as a bit field.
          This integer should equal the sum of the corresponding value for each
          of the following capabilities present:
@@ -53,10 +48,4 @@
          pulsating and RGB control would set this config to 75. -->
     <integer name="config_deviceLightCapabilities">232</integer>
 
-    <!-- Whether device has screen with higher aspect ratio -->
-    <bool name="config_haveHigherAspectRatioScreen">true</bool>
-
-    <!-- Whether device needs to wait for Qualcomm MPCTL service to start
-         before setting power profiles on boot. -->
-    <bool name="config_waitForMpctlOnBoot">true</bool>
 </resources>

overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (C) 2016 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <bool name="call_recording_enabled">true</bool>
-    <integer name="call_recording_audio_source">4</integer>
-</resources>

overlay/frameworks/base/core/res/res/values/config.xml

@@ -17,6 +17,32 @@
 <!-- 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">
+
+    <!-- Whether device has screen with higher aspect ratio -->
+    <bool name="config_haveHigherAspectRatioScreen">true</bool>
+
+    <!-- Whether the Unprocessed audio source supports the required frequency range and level -->
+    <bool name="config_supportAudioSourceUnprocessed">true</bool>
+
+    <!-- reference volume index for music stream to limit headphone volume and display warning -->
+    <integer name="config_safe_media_volume_index">15</integer>
+
+    <!-- When true use the linux /dev/input/event subsystem to detect the switch changes
+       on the headphone/microphone jack. When false use the older uevent framework. -->
+    <bool name="config_useDevInputEventForAudioJack">true</bool>
+
+    <!-- Flag indicating if the speed up audio on mt call code should be executed -->
+    <bool name="config_speed_up_audio_on_mt_calls">true</bool>
+
+    <!-- Operating volatage for bluetooth controller. 0 by default-->
+    <integer name="config_bluetooth_operating_voltage_mv">3700</integer>
+
+    <!-- Boolean indicating if current platform supports BLE peripheral mode -->
+    <bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
+
+    <!-- Boolean indicating if current platform supports HFP inband ringing -->
+    <bool name="config_bluetooth_hfp_inband_ringing_support">true</bool>
+
     <!-- Flag indicating whether the we should enable the automatic brightness in Settings.
          Software implementation will be used if config_hardware_auto_brightness_available is not set -->
     <bool name="config_automatic_brightness_available">true</bool>
@@ -607,19 +633,6 @@
         <item>399.81</item>
     </array>
 
-    <!-- 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">10</integer>
-
-    <!-- Default screen brightness setting.
-         Must be in the range specified by minimum and maximum. -->
-    <integer name="config_screenBrightnessSettingDefault">98</integer>
-
-    <!-- Minimum screen brightness setting allowed by the power manager.
-         The user is forbidden from setting the brightness below this level. -->
-    <integer name="config_screenBrightnessSettingMinimum">1</integer>
-
     <!-- Stability requirements in milliseconds for accepting a new brightness level.  This is used
          for debouncing the light sensor.  Different constants are used to debounce the light sensor
          when adapting to brighter or darker environments.  This parameter controls how quickly
@@ -640,195 +653,58 @@
           will not debounce light sensor readings -->
     <integer name="config_lightSensorWarmupTime">200</integer>
 
-    <!-- If this is true, the screen will come on when you unplug usb/power/whatever. -->
+    <!-- Screen brightness used to dim the screen when the user activity
-    <bool name="config_unplugTurnsOnScreen">true</bool>
+         timeout expires.  May be less than the minimum allowed brightness setting
+         that can be set by the user. -->
+    <integer name="config_screenBrightnessDim">10</integer>
 
-    <!-- Boolean indicating if restoring network selection should be skipped -->
+    <!-- Default screen brightness setting.
-    <!-- The restoring is handled by modem if it is true-->
+         Must be in the range specified by minimum and maximum. -->
-    <bool translatable="false" name="skip_restoring_network_selection">true</bool>
+    <integer name="config_screenBrightnessSettingDefault">98</integer>
 
-    <!-- Set to true to add links to Cell Broadcast app from Settings and MMS app. -->
+    <!-- Minimum screen brightness setting allowed by the power manager.
-    <bool name="config_cellBroadcastAppLinks">true</bool>
+         The user is forbidden from setting the brightness below this level. -->
+    <integer name="config_screenBrightnessSettingMinimum">1</integer>
 
-     <!-- Is the battery LED intrusive? Used to decide if there should be a disable option -->
+    <!-- Specify custom blanking delay of the display -->
-    <bool name="config_intrusiveBatteryLed">true</bool>
+    <integer name="config_screen_off_delay">0</integer>
 
-    <!-- MMS user agent string -->
+    <!-- Buttom brightness setting allowed by the power manager.
-    <string name="config_mms_user_agent" translatable="false">Android-Mms/2.0</string>
+         The user is forbidden from setting the brightness. -->
+    <integer name="config_buttonBrightnessSettingDefault">0</integer>
 
-    <!-- reference volume index for music stream to limit headphone volume and display warning -->
+    <!-- Whether camera shutter sound is forced or not  (country specific). -->
-    <integer name="config_safe_media_volume_index">15</integer>
+    <bool name="config_camera_sound_forced">false</bool>
 
-    <!-- MMS user agent prolfile url -->
+    <!-- Enable video pause workaround when enabling/disabling the camera. -->
-    <string name="config_mms_user_agent_profile_url" translatable="false">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
+    <bool name="config_useVideoPauseWorkaround">true</bool>
 
-    <!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->
+    <!-- Display mode remapping table.
-    <bool name="config_intrusiveNotificationLed">true</bool>
+         If the mode names returned by the backend do not match
-
+         the predefined and translated strings in the Settings
-    <!-- Does the notification LED support multiple colors?
+         app, they can be remapped here. The format is
-    Used to decide if the user can change the colors -->
+         "oldname:newname", one per entry. -->
-    <bool name="config_multiColorNotificationLed">false</bool>
+    <string-array name="config_displayModeMappings" translatable="false">
-
+        <item>A_Standard:standard</item>
-     <!-- The device supports freeform window management. Windows have title bars and can be moved
+        <item>B_Warm mode:reading</item>
-         and resized. If you set this to true, you also need to add
+        <item>D_Cold mode:dynamic</item>
-         PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT feature to your device specification.
-         The duplication is necessary, because this information is used before the features are
-         available to the system.-->
-    <bool name="config_freeformWindowManagement">true</bool>
-
-    <!-- List of regexpressions describing the interface (if any) that represent tetherable
-         USB interfaces.  If the device doesn't want to support tething over USB this should
-         be empty.  An example would be "usb.*" -->
-    <string-array translatable="false" name="config_tether_usb_regexs">
-        <item>"usb\\d"</item>
-        <item>"rndis\\d"</item>
     </string-array>
 
-    <!-- List of regexpressions describing the interface (if any) that represent tetherable
+    <!-- Should we filter any display modes which are unampped? -->
-         Wifi interfaces.  If the device doesn't want to support tethering over Wifi this
+    <bool name="config_filterDisplayModes">true</bool>
-         should be empty.  An example would be "softap.*" -->
-    <string-array translatable="false" name="config_tether_wifi_regexs">
-        <item>"wlan0"</item>
-        <item>"softap0"</item>
-    </string-array>
 
-    <!-- Dhcp range (min, max) to use for tethering purposes -->
+    <!-- Boolean indicating whether the HWC setColorTransform function can be performed efficiently
-    <!-- USB is  192.168.42.1 and 255.255.255.0
+         in hardware. -->
-         Wifi is 192.168.43.1 and 255.255.255.0
+    <bool name="config_setColorTransformAccelerated">true</bool>
-         BT is limited to max default of 5 connections. 192.168.44.1 to 192.168.48.1
-         with 255.255.255.0
-         P2P is 192.168.49.1 and 255.255.255.0
-         Wigig is 192.168.50.1 and 255.255.255.0
-         Wigig P2P is 192.168.51.1 and 255.255.255.0
-    -->
-    <string-array translatable="false" name="config_tether_dhcp_range">
-        <item>192.168.42.2</item>
-        <item>192.168.42.254</item>
-        <item>192.168.43.2</item>
-        <item>192.168.43.254</item>
-        <item>192.168.44.2</item>
-        <item>192.168.44.254</item>
-        <item>192.168.45.2</item>
-        <item>192.168.45.254</item>
-        <item>192.168.46.2</item>
-        <item>192.168.46.254</item>
-        <item>192.168.47.2</item>
-        <item>192.168.47.254</item>
-        <item>192.168.48.2</item>
-        <item>192.168.48.254</item>
-        <item>192.168.49.2</item>
-        <item>192.168.49.254</item>
-        <item>192.168.50.2</item>
-        <item>192.168.50.254</item>
-        <item>192.168.51.2</item>
-        <item>192.168.51.254</item>
-    </string-array>
 
-    <!-- dual sap mode is supported on this device. -->
+    <!-- Set this to true to enable the platform's auto-power-save modes like doze and
-    <bool name="config_wifi_dual_sap_mode_enabled">true</bool>
+         app standby.  These are not enabled by default because they require a standard
-
+         cloud-to-device messaging service for apps to interact correctly with the modes
-    <!-- list of interface names for SoftAp in Dual mode. -->
+         (such as to be able to deliver an instant message to the device even when it is
-    <string-array translatable="false" name="config_wifi_dual_sap_interfaces">
+         dozing).  This should be enabled if you have such services and expect apps to
-        <item>"softap1"</item>
+         correctly use them when installed on your device.  Otherwise, keep this disabled
-        <item>"softap2"</item>
+         so that applications can still use their own mechanisms. -->
-    </string-array>
+   <bool name="config_enableAutoPowerModes">true</bool>
-
-    <!-- List of regexpressions describing the interface (if any) that represent tetherable
-         bluetooth interfaces.  If the device doesn't want to support tethering over bluetooth this
-         should be empty. -->
-    <string-array translatable="false" name="config_tether_bluetooth_regexs">
-        <item>"bt-pan"</item>
-    </string-array>
-
-    <!-- When true, the tethering upstream network follows the current default
-         Internet network (except when the current default network is mobile,
-         in which case a DUN network will be used if required). -->
-    <bool translatable="false" name="config_tether_upstream_automatic">true</bool>
-
-    <!-- This string array should be overridden by the device to present a list of network
-         attributes.  This is used by the connectivity manager to decide which networks can coexist
-         based on the hardware -->
-    <!-- An Array of "[Connection name],[ConnectivityManager.TYPE_xxxx],
-         [associated radio-type],[priority],[restoral-timer(ms)],[dependencyMet]  -->
-    <!-- the 5th element "resore-time" indicates the number of milliseconds to delay
-         before automatically restore the default connection.  Set -1 if the connection
-         does not require auto-restore. -->
-    <!-- the 6th element indicates boot-time dependency-met value. -->
-    <string-array translatable="false" name="networkAttributes">
-        <item>"wifi,1,1,1,-1,true"</item>
-        <item>"mobile,0,0,0,-1,true"</item>
-        <item>"mobile_mms,2,0,4,60000,true"</item>
-        <item>"mobile_supl,3,0,2,60000,true"</item>
-        <item>"mobile_dun,4,0,2,60000,true"</item>
-        <item>"mobile_hipri,5,0,3,60000,true"</item>
-        <item>"mobile_fota,10,0,2,60000,true"</item>
-        <item>"mobile_ims,11,0,2,60000,true"</item>
-        <item>"mobile_cbs,12,0,2,60000,true"</item>
-        <item>"bluetooth,7,7,2,-1,true"</item>
-        <item>"mobile_emergency,15,0,5,-1,true"</item>
-        <item>"ethernet,9,9,9,-1,true"</item>
-    </string-array>
-
-    <!-- This string array should be overridden by the device to present a list of radio
-         attributes.  This is used by the connectivity manager to decide which networks can coexist
-         based on the hardware -->
-    <!-- An Array of "[ConnectivityManager connectionType],
-                      [# simultaneous connection types]"  -->
-    <string-array translatable="false" name="radioAttributes">
-        <item>"1,1"</item>
-        <item>"0,1"</item>
-        <item>"7,1"</item>
-        <item>"9,1"</item>
-    </string-array>
-
-    <!-- Whether WiFi display is supported by this device.
-         There are many prerequisites for this feature to work correctly.
-         Here are a few of them:
-         * The WiFi radio must support WiFi P2P.
-         * The WiFi radio must support concurrent connections to the WiFi display and
-           to an access point.
-         * The Audio Flinger audio_policy.conf file must specify a rule for the "r_submix"
-           remote submix module.  This module is used to record and stream system
-           audio output to the WiFi display encoder in the media server.
-         * The remote submix module "audio.r_submix.default" must be installed on the device.
-         * The device must be provisioned with HDCP keys (for protected content).
-    -->
-    <bool name="config_enableWifiDisplay">true</bool>
-
-    <!-- Set to true if the wifi display supports compositing content stored
-         in gralloc protected buffers.  For this to be true, there must exist
-         a protected hardware path for surface flinger to composite and send
-         protected buffers to the wifi display video encoder.
-         If this flag is false, we advise applications not to use protected
-         buffers (if possible) when presenting content to a wifi display because
-         the content may be blanked.
-         This flag controls whether the {@link Display#FLAG_SUPPORTS_PROTECTED_BUFFERS}
-         flag is set for wifi displays.
-    -->
-    <bool name="config_wifiDisplaySupportsProtectedBuffers">true</bool>
-
-    <!-- Boolean indicating whether the wifi chipset has dual frequency band support -->
-    <bool translatable="false" name="config_wifi_dual_band_support">true</bool>
-
-    <!-- Boolean indicating whether the wifi chipset has background scan support -->
-    <bool translatable="false" name="config_wifi_background_scan_support">true</bool>
-
-    <!-- Wifi driver supports batched scan -->
-    <bool translatable="false" name="config_wifi_batched_scan_supported">true</bool>
-
-    <!-- When true use the linux /dev/input/event subsystem to detect the switch changes
-         on the headphone/microphone jack. When false use the older uevent framework. -->
-    <bool name="config_useDevInputEventForAudioJack">true</bool>
-
-    <!-- Indicate whether closing the lid causes the device to go to sleep and opening
-         it causes the device to wake up.
-         The default is false. -->
-    <bool name="config_lidControlsSleep">true</bool>
-
-    <!-- Enables or disables fading edges when marquee is enabled in TextView.
-         Off by default, since the framebuffer readback used to implement the
-         fading edges is prohibitively expensive on most GPUs. -->
-    <bool name="config_ui_enableFadingMarquee">false</bool>
 
     <!-- ComponentName of a dream to show whenever the system would otherwise have
          gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
@@ -841,6 +717,18 @@
          Doze dreams will run whenever the power manager is in a dozing state. -->
     <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 
+    <!-- Control whether the always on display mode is available. This should only be enabled on
+         devices where the display has been tuned to be power efficient in DOZE and/or DOZE_SUSPEND
+         states. -->
+    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
+
+    <!-- Allow automatic adjusting of the screen brightness while dozing in low power state. -->
+    <bool name="config_allowAutoBrightnessWhileDozing">true</bool>
+
+    <!-- Control whether the always on display mode is enabled by default. This value will be used
+         during initialization when the setting is still null. -->
+    <bool name="config_dozeAlwaysOnEnabled">false</bool>
+
     <!-- If true, the doze component is not started until after the screen has been
          turned off and the screen off animation has been performed. -->
     <bool name="config_dozeAfterScreenOffByDefault">true</bool>
@@ -889,112 +777,32 @@
          that can be set by the user. -->
     <integer name="config_screenBrightnessDoze">17</integer>
 
+    <!-- Specify if the fingerprint hardware support gestures-->
+    <bool name="config_fingerprintSupportsGestures">true</bool>
+
+    <!-- Enable system navigation keys. -->
+    <bool name="config_supportSystemNavigationKeys">true</bool>
+
+    <!-- Whether notify fingerprint client of successful cancelled authentication -->
+    <bool name="config_notifyClientOnFingerprintCancelSuccess">true</bool>
+
+    <!-- The device supports freeform window management. Windows have title bars and can be moved
+        and resized. If you set this to true, you also need to add
+        PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT feature to your device specification.
+        The duplication is necessary, because this information is used before the features are
+        available to the system.-->
+    <bool name="config_freeformWindowManagement">true</bool>
+
+    <!-- Indicate whether closing the lid causes the device to go to sleep and opening
+         it causes the device to wake up.
+         The default is false. -->
+    <bool name="config_lidControlsSleep">true</bool>
+
     <!-- Whether device supports double tap to wake -->
     <bool name="config_supportDoubleTapWake">true</bool>
 
-    <!-- Configure mobile tcp buffer sizes in the form:
+    <!-- If this is true, the screen will come on when you unplug usb/power/whatever. -->
-         rat-name:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
+    <bool name="config_unplugTurnsOnScreen">true</bool>
-         If no value is found for the rat-name in use, the system default will be applied.
-    -->
-    <string-array name="config_mobile_tcp_buffers">
-        <item>"5gnr:2097152,6291456,16777216,512000,2097152,8388608"</item>
-        <item>"lte:2097152,4194304,8388608,262144,524288,1048576"</item>
-        <item>"lte_ca:4096,6291456,12582912,4096,1048576,2097152"</item>
-        <item>"umts:4094,87380,1220608,4096,16384,1220608"</item>
-        <item>"hspa:4094,87380,1220608,4096,16384,1220608"</item>
-        <item>"hsupa:4094,87380,1220608,4096,16384,1220608"</item>
-        <item>"hsdpa:4094,87380,1220608,4096,16384,1220608"</item>
-        <item>"hspap:4094,87380,1220608,4096,16384,1220608"</item>
-        <item>"edge:4093,26280,35040,4096,16384,35040"</item>
-        <item>"gprs:4092,8760,11680,4096,8760,11680"</item>
-        <item>"evdo:4094,87380,524288,4096,16384,262144"</item>
-    </string-array>
-
-    <!-- Configure wifi tcp buffersizes in the form:
-         rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max -->
-    <string name="config_wifi_tcp_buffers" translatable="false">524288,2097152,8388608,262144,524288,4194304</string>
-
-    <!-- Flag specifying whether VoLTE is available on device -->
-    <bool name="config_device_volte_available">true</bool>
-
-    <!-- Flag specifying whether VoLTE should be available for carrier: independent of
-         carrier provisioning. If false: hard disabled. If true: then depends on carrier
-         provisioning, availability etc -->
-    <bool name="config_carrier_volte_available">true</bool>
-    <bool name="config_device_vt_available">true</bool>
-
-    <!-- Flag specifying whether WFC over IMS is available on device -->
-    <bool name="config_device_wfc_ims_available">true</bool>
-
-    <!-- Flag specifying whether WFC over IMS should be available for carrier: independent of
-         carrier provisioning. If false: hard disabled. If true: then depends on carrier
-         provisioning, availability etc -->
-    <bool name="config_carrier_wfc_ims_available">true</bool>
-
-    <!--  Maximum number of supported users -->
-    <integer name="config_multiuserMaximumUsers">4</integer>
-
-    <!--  Whether Multiuser UI should be shown -->
-    <bool name="config_enableMultiUserUI">true</bool>
-
-    <!-- ImsService package name to bind to by default, if config_dynamic_bind_ims is true -->
-    <string name="config_ims_package">org.codeaurora.ims</string>
-
-    <!-- Flag specifying whether or not IMS will use the ImsResolver dynamically -->
-    <bool name="config_dynamic_bind_ims">true</bool>
-
-    <!-- Enable video pause workaround when enabling/disabling the camera. -->
-    <bool name="config_useVideoPauseWorkaround">true</bool>
-
-    <!-- Config determines whether to update phone object when voice registration
-         state changes. Voice radio tech change will always trigger an update of
-         phone object irrespective of this config -->
-    <bool name="config_switch_phone_on_voice_reg_state_change">false</bool>
-
-    <!-- Whether camera shutter sound is forced or not  (country specific). -->
-    <bool name="config_camera_sound_forced">false</bool>
-
-    <!-- Boolean indicating if current platform supports BLE peripheral mode -->
-    <bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
-
-    <!-- Is the device capable of hot swapping an ICC Card -->
-    <bool name="config_hotswapCapable">true</bool>
-
-    <!-- If true, the screen can be rotated via the accelerometer in all 4
-         rotations as the default behavior. -->
-    <bool name="config_allowAllRotations">true</bool>
-
-    <!-- Enable lockscreen rotation by default -->
-    <bool name="config_enableLockScreenRotation">true</bool>
-
-    <!-- Integer parameters of the wifi to cellular handover feature
-         wifi should not stick to bad networks -->
-    <integer name="config_wifi_framework_wifi_score_bad_rssi_threshold_5GHz">-100</integer>
-    <integer name="config_wifi_framework_wifi_score_low_rssi_threshold_5GHz">-100</integer>
-    <integer name="config_wifi_framework_wifi_score_bad_rssi_threshold_24GHz">-100</integer>
-    <integer name="config_wifi_framework_wifi_score_low_rssi_threshold_24GHz">-100</integer>
-
-    <!-- Flag indicating if the speed up audio on mt call code should be executed -->
-    <bool name="config_speed_up_audio_on_mt_calls">true</bool>
-
-    <!-- Vibrator pattern for feedback about a long screen/key press -->
-    <integer-array name="config_longPressVibePattern">
-        <item>0</item>
-        <item>7</item>
-        <item>10</item>
-    </integer-array>
-
-    <!-- Vibrator pattern for feedback about touching a virtual key -->
-    <integer-array name="config_virtualKeyVibePattern">
-        <item>0</item>
-        <item>5</item>
-        <item>10</item>
-    </integer-array>
-
-    <!-- Vibrator pattern for a very short but reliable vibration for soft keyboard tap -->
-    <integer-array name="config_keyboardTapVibePattern">
-        <item>10</item>
-    </integer-array>
 
     <!-- Control the behavior when the user long presses the home button.
             0 - Nothing
@@ -1008,15 +816,88 @@
     -->
     <integer name="config_longPressOnHomeBehavior">3</integer>
 
-    <!-- Operating volatage for bluetooth controller. 0 by default-->
+    <!-- Whether or not swipe up gesture's opt-in setting is available on this device -->
-    <integer name="config_bluetooth_operating_voltage_mv">3700</integer>
+    <bool name="config_swipe_up_gesture_setting_available">true</bool>
 
     <!--  Define Google play service package for FRP-->
     <string name="config_persistentDataPackageName" translatable="false">com.google.android.gms</string>
 
-    <!-- Boolean indicating whether the HWC setColorTransform function can be performed efficiently
+    <!-- Flag indicating whether round icons should be parsed from the application manifest. -->
-         in hardware. -->
+   <bool name="config_useRoundIcon">true</bool>
-    <bool name="config_setColorTransformAccelerated">true</bool>
+
+   <!-- Specifies the path that is used by AdaptiveIconDrawable class to crop launcher icons. -->
+   <string name="config_icon_mask" translatable="false">"M50 0C77.6 0 100 22.4 100 50C100 77.6 77.6 100 50 100C22.4 100 0 77.6 0 50C0 22.4 22.4 0 50 0Z"</string>
+
+   <!-- Flag specifying whether VoLTE is available on device -->
+   <bool name="config_device_volte_available">true</bool>
+
+   <!-- Flag specifying whether VoLTE should be available for carrier: independent of
+        carrier provisioning. If false: hard disabled. If true: then depends on carrier
+        provisioning, availability etc -->
+   <bool name="config_carrier_volte_available">true</bool>
+   <bool name="config_device_vt_available">true</bool>
+
+   <!-- Flag specifying whether WFC over IMS is available on device -->
+   <bool name="config_device_wfc_ims_available">true</bool>
+
+   <!-- Flag specifying whether WFC over IMS should be available for carrier: independent of
+        carrier provisioning. If false: hard disabled. If true: then depends on carrier
+        provisioning, availability etc -->
+   <bool name="config_carrier_wfc_ims_available">true</bool>
+
+   <!-- ImsService package name to bind to by default, if config_dynamic_bind_ims is true -->
+   <string name="config_ims_package">org.codeaurora.ims</string>
+
+   <!-- Flag specifying whether or not IMS will use the ImsResolver dynamically -->
+   <bool name="config_dynamic_bind_ims">true</bool>
+
+    <!-- Is the battery LED intrusive? Used to decide if there should be a disable option -->
+    <bool name="config_intrusiveBatteryLed">true</bool>
+
+    <!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->
+    <bool name="config_intrusiveNotificationLed">true</bool>
+
+    <!-- Does the notification LED support multiple colors?
+    Used to decide if the user can change the colors -->
+    <bool name="config_multiColorNotificationLed">false</bool>
+
+    <!-- Default value for led color when battery is low on charge -->
+    <integer name="config_notificationsBatteryLowARGB">0xFFFFFFFF</integer>
+
+    <!-- Default value for led color when battery is medium charged -->
+    <integer name="config_notificationsBatteryMediumARGB">0xFFFFFFFF</integer>
+
+    <!-- Default value for led color when battery is fully charged -->
+    <integer name="config_notificationsBatteryFullARGB">0xFFFFFFFF</integer>
+
+    <!-- Multicolor Led Support -->
+    <bool name="config_multiColorBatteryLed">false</bool>
+
+    <!-- MMS user agent string -->
+    <string name="config_mms_user_agent" translatable="false">Android-Mms/2.0</string>
+
+    <!-- MMS user agent prolfile url -->
+    <string name="config_mms_user_agent_profile_url" translatable="false">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
+
+    <!-- Set to true to add links to Cell Broadcast app from Settings and MMS app. -->
+    <bool name="config_cellBroadcastAppLinks">true</bool>
+
+    <!--  Maximum number of supported users -->
+    <integer name="config_multiuserMaximumUsers">4</integer>
+
+    <!--  Whether Multiuser UI should be shown -->
+    <bool name="config_enableMultiUserUI">true</bool>
+
+    <!-- Whether a software navigation bar should be shown. NOTE: in the future this may be
+                  autodetected from the Configuration. -->
+    <bool name="config_showNavigationBar">true</bool>
+
+    <!-- If this is true, device supports Sustained Performance Mode. -->
+    <bool name="config_sustainedPerformanceModeSupported">true</bool>
+
+    <!-- Whether device needs to wait for Qualcomm MPCTL service to start
+         before setting power profiles on boot. -->
+    <bool name="config_waitForMpctlOnBoot">true</bool>
 
     <!-- Default list of files pinned by the Pinner Service -->
     <string-array translatable="false" name="config_defaultPinnerServiceFiles">
@@ -1039,19 +920,19 @@
       <item>/system/lib64/libRSCpuRef.so</item>
       <item>/system/lib64/libblas.so</item>
       <item>"/system/lib64/libsurfaceflinger.so"</item>
-    </string-array>
+   </string-array>
 
     <!-- List of files pinned by the Pinner Service with the apex boot image b/119800099 -->
     <string-array translatable="false" name="config_apexBootImagePinnerServiceFiles">
-        <item>"/system/framework/framework.jar"</item>
+      <item>"/system/framework/framework.jar"</item>
-        <item>"/system/framework/services.jar"</item>
+      <item>"/system/framework/services.jar"</item>
-        <item>"/system/framework/arm64/apex.oat"</item>
+      <item>"/system/framework/arm64/apex.oat"</item>
-        <item>"/system/framework/arm64/apex-core-libart.oat"</item>
+      <item>"/system/framework/arm64/apex-core-libart.oat"</item>
-        <item>"/apex/com.android.runtime/javalib/core-oj.jar"</item>
+      <item>"/apex/com.android.runtime/javalib/core-oj.jar"</item>
-        <item>"/apex/com.android.runtime/javalib/core-libart.jar"</item>
+      <item>"/apex/com.android.runtime/javalib/core-libart.jar"</item>
-        <item>"/apex/com.android.media/javalib/updatable-media.jar"</item>
+      <item>"/apex/com.android.media/javalib/updatable-media.jar"</item>
-        <item>"/system/priv-app/SystemUI/SystemUI.apk"</item>
+      <item>"/system/priv-app/SystemUI/SystemUI.apk"</item>
-        <item>"/system/lib64/libsurfaceflinger.so"</item>
+      <item>"/system/lib64/libsurfaceflinger.so"</item>
     </string-array>
 
     <!-- True if camera app should be pinned via Pinner Service -->
@@ -1060,40 +941,93 @@
     <!-- Should the pinner service pin the Home application? -->
     <bool name="config_pinnerHomeApp">true</bool>
 
-    <!-- Default value for led color when battery is low on charge -->
-    <integer name="config_notificationsBatteryLowARGB">0xFFFFFFFF</integer>
 
-    <!-- Default value for led color when battery is medium charged -->
+    <!-- Default value for proximity check on screen wake.
-    <integer name="config_notificationsBatteryMediumARGB">0xFFFFFFFF</integer>
+    Enable for devices that have a fast response proximity sensor (ideally < 300ms)-->
+    <bool name="config_proximityCheckOnWake">true</bool>
+    <bool name="config_proximityCheckOnWakeEnabledByDefault">true</bool>
 
-    <!-- Default value for led color when battery is fully charged -->
+    <!-- Time to give to the proximity sensor before toggling the flashlight with the Power button.
-    <integer name="config_notificationsBatteryFullARGB">0xFFFFFFFF</integer>
+      Set to -1 to disable the proximity sensor check at all-->
+    <integer name="config_flashlightProximityTimeout">-1</integer>
 
-    <!-- Multicolor Led Support -->
+    <!-- Whether to artificially interpret all signal strengths as
-    <bool name="config_multiColorBatteryLed">false</bool>
+         one bar higher than they actually are -->
-
+    <bool name="config_inflateSignalStrength">true</bool>
-    <!-- Whether a software navigation bar should be shown. NOTE: in the future this may be
-                  autodetected from the Configuration. -->
-    <bool name="config_showNavigationBar">true</bool>
-
-    <!-- Whether or not swipe up gesture's opt-in setting is available on this device -->
-    <bool name="config_swipe_up_gesture_setting_available">true</bool>
 
     <!-- Whether device ignores the RSSNR signal implementation -->
     <bool name="config_ignoreRssnrSignalLevel">true</bool>
 
-    <!-- Enable ACS (auto channel selection) for Wifi hotspot (SAP) -->
+    <!-- This string array should be overridden by the device to present a list of network
-    <bool translatable="false" name="config_wifi_softap_acs_supported">false</bool>
+         attributes.  This is used by the connectivity manager to decide which networks can coexist
+         based on the hardware -->
+    <!-- An Array of "[Connection name],[ConnectivityManager.TYPE_xxxx],
+         [associated radio-type],[priority],[restoral-timer(ms)],[dependencyMet]  -->
+    <!-- the 5th element "resore-time" indicates the number of milliseconds to delay
+         before automatically restore the default connection.  Set -1 if the connection
+         does not require auto-restore. -->
+    <!-- the 6th element indicates boot-time dependency-met value. -->
+    <string-array translatable="false" name="networkAttributes">
+        <item>"wifi,1,1,1,-1,true"</item>
+        <item>"mobile,0,0,0,-1,true"</item>
+        <item>"mobile_mms,2,0,4,60000,true"</item>
+        <item>"mobile_supl,3,0,2,60000,true"</item>
+        <item>"mobile_dun,4,0,2,60000,true"</item>
+        <item>"mobile_hipri,5,0,3,60000,true"</item>
+        <item>"mobile_fota,10,0,2,60000,true"</item>
+        <item>"mobile_ims,11,0,2,60000,true"</item>
+        <item>"mobile_cbs,12,0,2,60000,true"</item>
+        <item>"bluetooth,7,7,2,-1,true"</item>
+        <item>"mobile_emergency,15,0,5,-1,true"</item>
+        <item>"ethernet,9,9,9,-1,true"</item>
+    </string-array>
 
-    <!-- Enable 802.11ac for Wifi hotspot (SAP) -->
+    <!-- This string array should be overridden by the device to present a list of radio
-    <bool translatable="false" name="config_wifi_softap_ieee80211ac_supported">true</bool>
+         attributes.  This is used by the connectivity manager to decide which networks can coexist
+         based on the hardware -->
+    <!-- An Array of "[ConnectivityManager connectionType],
+                      [# simultaneous connection types]"  -->
+    <string-array translatable="false" name="radioAttributes">
+        <item>"1,1"</item>
+        <item>"0,1"</item>
+        <item>"7,1"</item>
+        <item>"9,1"</item>
+    </string-array>
 
-    <!-- Number of physical SIM slots on the device. This includes both eSIM and pSIM slots, and
+
-         is not necessarily the same as the number of phones/logical modems supported by the device.
+    <!-- Configure mobile tcp buffer sizes in the form:
-         For example, a multi-sim device can have 2 phones/logical modems, but 3 physical slots,
+         rat-name:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
-         or a single SIM device can have 1 phones/logical modems, but 2 physical slots (one eSIM
+         If no value is found for the rat-name in use, the system default will be applied.
-         and one pSIM) -->
+    -->
-    <integer name="config_num_physical_slots">2</integer>
+    <string-array name="config_mobile_tcp_buffers">
+        <item>"5gnr:2097152,6291456,16777216,512000,2097152,8388608"</item>
+        <item>"lte:2097152,4194304,8388608,262144,524288,1048576"</item>
+        <item>"lte_ca:4096,6291456,12582912,4096,1048576,2097152"</item>
+        <item>"umts:4094,87380,1220608,4096,16384,1220608"</item>
+        <item>"hspa:4094,87380,1220608,4096,16384,1220608"</item>
+        <item>"hsupa:4094,87380,1220608,4096,16384,1220608"</item>
+        <item>"hsdpa:4094,87380,1220608,4096,16384,1220608"</item>
+        <item>"hspap:4094,87380,1220608,4096,16384,1220608"</item>
+        <item>"edge:4093,26280,35040,4096,16384,35040"</item>
+        <item>"gprs:4092,8760,11680,4096,8760,11680"</item>
+        <item>"evdo:4094,87380,524288,4096,16384,262144"</item>
+    </string-array>
+
+    <!-- Boolean indicating if restoring network selection should be skipped -->
+    <!-- The restoring is handled by modem if it is true-->
+    <bool translatable="false" name="skip_restoring_network_selection">true</bool>
+
+    <!-- Whether the new Auto Selection Network UI should be shown -->
+    <bool name="config_enableNewAutoSelectNetworkUI">true</bool>
+
+    <!-- Enable dual LTE capability support-->
+    <bool name="config_dual_LTE_capability">true</bool>
+
+    <!-- Whether the device has outdated qti-telephony-common.jar -->
+    <bool name="config_oldQtiTelephony">false</bool>
+
+    <!-- Is the device capable of hot swapping an ICC Card -->
+    <bool name="config_hotswapCapable">true</bool>
 
     <!-- The RadioAccessFamilies supported by the device.
       Empty is viewed as "all".  Only used on devices which
@@ -1101,74 +1035,143 @@
       format is UMTS|LTE|... -->
     <string translatable="false" name="config_radio_access_family">CDMA|EVDO|GSM|TD_SCDMA|WCDMA|LTE</string>
 
-    <!-- Enable system navigation keys. -->
+    <!-- Config determines whether to update phone object when voice registration
-    <bool name="config_supportSystemNavigationKeys">true</bool>
+         state changes. Voice radio tech change will always trigger an update of
+         phone object irrespective of this config -->
+    <bool name="config_switch_phone_on_voice_reg_state_change">false</bool>
+
+    <!-- If true, the screen can be rotated via the accelerometer in all 4
+         rotations as the default behavior. -->
+    <bool name="config_allowAllRotations">true</bool>
+
+    <!-- Enable lockscreen rotation by default -->
+    <bool name="config_enableLockScreenRotation">true</bool>
 
     <!-- Flag indicating whether we should enable smart battery. -->
     <bool name="config_smart_battery_available">true</bool>
 
-     <!-- Set this to true to enable the platform's auto-power-save modes like doze and
-          app standby.  These are not enabled by default because they require a standard
-          cloud-to-device messaging service for apps to interact correctly with the modes
-          (such as to be able to deliver an instant message to the device even when it is
-          dozing).  This should be enabled if you have such services and expect apps to
-          correctly use them when installed on your device.  Otherwise, keep this disabled
-          so that applications can still use their own mechanisms. -->
-    <bool name="config_enableAutoPowerModes">true</bool>
-
-     <!-- Flag indicating whether round icons should be parsed from the application manifest. -->
-    <bool name="config_useRoundIcon">true</bool>
-
-    <!-- Whether the device has outdated qti-telephony-common.jar -->
-    <bool name="config_oldQtiTelephony">false</bool>
-
-    <!-- Whether notify fingerprint client of successful cancelled authentication -->
-    <bool name="config_notifyClientOnFingerprintCancelSuccess">true</bool>
-
-    <!-- Whether the Unprocessed audio source supports the required frequency range and level -->
-    <bool name="config_supportAudioSourceUnprocessed">true</bool>
-
-    <!-- Control whether the always on display mode is available. This should only be enabled on
-         devices where the display has been tuned to be power efficient in DOZE and/or DOZE_SUSPEND
-         states. -->
-    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
-
-    <!-- Allow automatic adjusting of the screen brightness while dozing in low power state. -->
-    <bool name="config_allowAutoBrightnessWhileDozing">true</bool>
-
-    <!-- Control whether the always on display mode is enabled by default. This value will be used
-         during initialization when the setting is still null. -->
-    <bool name="config_dozeAlwaysOnEnabled">false</bool>
-
-    <!-- Specify custom blanking delay of the display -->
-    <integer name="config_screen_off_delay">0</integer>
-
-    <!-- Specify if the fingerprint hardware support gestures-->
-    <bool name="config_fingerprintSupportsGestures">true</bool>
-
-    <!-- Time to give to the proximity sensor before toggling the flashlight with the Power button.
-      Set to -1 to disable the proximity sensor check at all-->
-    <integer name="config_flashlightProximityTimeout">-1</integer>
-
-    <!-- Whether the new Auto Selection Network UI should be shown -->
-    <bool name="config_enableNewAutoSelectNetworkUI">true</bool>
-
-    <!-- Specifies the path that is used by AdaptiveIconDrawable class to crop launcher icons. -->
-    <string name="config_icon_mask" translatable="false">"M50 0C77.6 0 100 22.4 100 50C100 77.6 77.6 100 50 100C22.4 100 0 77.6 0 50C0 22.4 22.4 0 50 0Z"</string>
-
     <!-- Smart charge sysfs node and value for suspend/resume charging-->
     <string name="config_SmartChargingSysfsNode" translatable="false">/sys/class/power_supply/battery/input_suspend</string>
     <string name="config_SmartChargingSupspendValue" translatable="false">1</string>
     <string name="config_SmartChargingResumeValue" translatable="false">0</string>
 
-    <!-- Configuration to enable non-default PDP during IWLAN -->
+    <!-- List of regexpressions describing the interface (if any) that represent tetherable
-    <bool name="config_feature_iwlan_enabled">true</bool>
+         USB interfaces.  If the device doesn't want to support tething over USB this should
+         be empty.  An example would be "usb.*" -->
+    <string-array translatable="false" name="config_tether_usb_regexs">
+        <item>"usb\\d"</item>
+        <item>"rndis\\d"</item>
+    </string-array>
 
-    <!-- If this is true, device supports Sustained Performance Mode. -->
+    <!-- List of regexpressions describing the interface (if any) that represent tetherable
-    <bool name="config_sustainedPerformanceModeSupported">true</bool>
+         Wifi interfaces.  If the device doesn't want to support tethering over Wifi this
+         should be empty.  An example would be "softap.*" -->
+    <string-array translatable="false" name="config_tether_wifi_regexs">
+        <item>"wlan0"</item>
+        <item>"softap0"</item>
+    </string-array>
 
-    <!-- Enable dual LTE capability support-->
+    <!-- List of regexpressions describing the interface (if any) that represent tetherable
-    <bool name="config_dual_LTE_capability">true</bool>
+         bluetooth interfaces.  If the device doesn't want to support tethering over bluetooth this
+         should be empty. -->
+    <string-array translatable="false" name="config_tether_bluetooth_regexs">
+        <item>"bt-pan"</item>
+    </string-array>
+
+    <!-- When true, the tethering upstream network follows the current default
+         Internet network (except when the current default network is mobile,
+         in which case a DUN network will be used if required). -->
+    <bool translatable="false" name="config_tether_upstream_automatic">true</bool>
+
+    <!-- Dhcp range (min, max) to use for tethering purposes -->
+    <!-- USB is  192.168.42.1 and 255.255.255.0
+         Wifi is 192.168.43.1 and 255.255.255.0
+         BT is limited to max default of 5 connections. 192.168.44.1 to 192.168.48.1
+         with 255.255.255.0
+         P2P is 192.168.49.1 and 255.255.255.0
+         Wigig is 192.168.50.1 and 255.255.255.0
+         Wigig P2P is 192.168.51.1 and 255.255.255.0
+    -->
+    <string-array translatable="false" name="config_tether_dhcp_range">
+        <item>192.168.42.2</item>
+        <item>192.168.42.254</item>
+        <item>192.168.43.2</item>
+        <item>192.168.43.254</item>
+        <item>192.168.44.2</item>
+        <item>192.168.44.254</item>
+        <item>192.168.45.2</item>
+        <item>192.168.45.254</item>
+        <item>192.168.46.2</item>
+        <item>192.168.46.254</item>
+        <item>192.168.47.2</item>
+        <item>192.168.47.254</item>
+        <item>192.168.48.2</item>
+        <item>192.168.48.254</item>
+        <item>192.168.49.2</item>
+        <item>192.168.49.254</item>
+        <item>192.168.50.2</item>
+        <item>192.168.50.254</item>
+        <item>192.168.51.2</item>
+        <item>192.168.51.254</item>
+    </string-array>
+
+    <!-- Enables or disables fading edges when marquee is enabled in TextView.
+         Off by default, since the framebuffer readback used to implement the
+         fading edges is prohibitively expensive on most GPUs. -->
+    <bool name="config_ui_enableFadingMarquee">false</bool>
+
+    <!-- Vibrator pattern for feedback about a long screen/key press -->
+    <integer-array name="config_longPressVibePattern">
+        <item>0</item>
+        <item>7</item>
+        <item>10</item>
+    </integer-array>
+
+    <!-- Vibrator pattern for feedback about touching a virtual key -->
+    <integer-array name="config_virtualKeyVibePattern">
+        <item>0</item>
+        <item>5</item>
+        <item>10</item>
+    </integer-array>
+
+    <!-- Vibrator pattern for a very short but reliable vibration for soft keyboard tap -->
+    <integer-array name="config_keyboardTapVibePattern">
+        <item>10</item>
+    </integer-array>
+
+    <!-- Enables or disables haptic effect when the text insertion/selection handle is moved
+     manually by the user. Off by default, since the expected haptic feedback may not be
+     available on some devices. -->
+    <bool name="config_enableHapticTextHandle">true</bool>
+
+    <!-- Boolean indicating whether the wifi chipset has background scan support -->
+    <bool translatable="false" name="config_wifi_background_scan_support">true</bool>
+
+    <!-- Wifi driver supports batched scan -->
+    <bool translatable="false" name="config_wifi_batched_scan_supported">true</bool>
+
+    <!-- Configure wifi tcp buffersizes in the form:
+         rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max -->
+    <string name="config_wifi_tcp_buffers" translatable="false">524288,2097152,8388608,262144,524288,4194304</string>
+
+    <!-- Integer parameters of the wifi to cellular handover feature
+         wifi should not stick to bad networks -->
+    <integer name="config_wifi_framework_wifi_score_bad_rssi_threshold_5GHz">-100</integer>
+    <integer name="config_wifi_framework_wifi_score_low_rssi_threshold_5GHz">-100</integer>
+    <integer name="config_wifi_framework_wifi_score_bad_rssi_threshold_24GHz">-100</integer>
+    <integer name="config_wifi_framework_wifi_score_low_rssi_threshold_24GHz">-100</integer>
+
+    <!-- dual sap mode is supported on this device. -->
+    <bool name="config_wifi_dual_sap_mode_enabled">true</bool>
+
+    <!-- Boolean indicating whether the wifi chipset has dual frequency band support -->
+    <bool translatable="false" name="config_wifi_dual_band_support">true</bool>
+
+    <!-- list of interface names for SoftAp in Dual mode. -->
+    <string-array translatable="false" name="config_wifi_dual_sap_interfaces">
+        <item>"softap1"</item>
+        <item>"softap2"</item>
+    </string-array>
 
     <!-- True if the firmware supports connected MAC randomization -->
     <bool name="config_wifi_connected_mac_randomization_supported">true</bool>
@@ -1176,15 +1179,38 @@
     <!-- True if the firmware supports Wi-Fi link probing -->
     <bool name="config_wifi_link_probing_supported">true</bool>
 
-    <!-- Enables or disables haptic effect when the text insertion/selection handle is moved
+    <!-- Enable ACS (auto channel selection) for Wifi hotspot (SAP) -->
-      manually by the user. Off by default, since the expected haptic feedback may not be
+    <bool translatable="false" name="config_wifi_softap_acs_supported">false</bool>
-      available on some devices. -->
-    <bool name="config_enableHapticTextHandle">true</bool>
 
-    <!-- Boolean indicating if current platform supports HFP inband ringing -->
+    <!-- Enable 802.11ac for Wifi hotspot (SAP) -->
-    <bool name="config_bluetooth_hfp_inband_ringing_support">true</bool>
+    <bool translatable="false" name="config_wifi_softap_ieee80211ac_supported">true</bool>
 
-    <!-- Whether to artificially interpret all signal strengths as
+    <!-- Whether WiFi display is supported by this device.
-         one bar higher than they actually are -->
+         There are many prerequisites for this feature to work correctly.
-    <bool name="config_inflateSignalStrength">true</bool>
+         Here are a few of them:
+         * The WiFi radio must support WiFi P2P.
+         * The WiFi radio must support concurrent connections to the WiFi display and
+           to an access point.
+         * The Audio Flinger audio_policy.conf file must specify a rule for the "r_submix"
+           remote submix module.  This module is used to record and stream system
+           audio output to the WiFi display encoder in the media server.
+         * The remote submix module "audio.r_submix.default" must be installed on the device.
+         * The device must be provisioned with HDCP keys (for protected content).
+    -->
+    <bool name="config_enableWifiDisplay">true</bool>
+
+    <!-- Set to true if the wifi display supports compositing content stored
+         in gralloc protected buffers.  For this to be true, there must exist
+         a protected hardware path for surface flinger to composite and send
+         protected buffers to the wifi display video encoder.
+         If this flag is false, we advise applications not to use protected
+         buffers (if possible) when presenting content to a wifi display because
+         the content may be blanked.
+         This flag controls whether the {@link Display#FLAG_SUPPORTS_PROTECTED_BUFFERS}
+         flag is set for wifi displays.
+    -->
+    <bool name="config_wifiDisplaySupportsProtectedBuffers">true</bool>
+
+    <!-- Configuration to enable non-default PDP during IWLAN -->
+    <bool name="config_feature_iwlan_enabled">true</bool>
 </resources>

overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml

@@ -18,6 +18,9 @@
 -->
 <resources>
 
+    <!-- Whether Bluetooth should be switched on by default -->
+    <bool name="def_bluetooth_on">false</bool>
+
     <!-- Set the automatic brightness mode on by default -->
     <bool name="def_screen_brightness_automatic_mode">true</bool>
 
@@ -32,8 +35,5 @@
 
     <!-- Disable UI touch haptic feedback by default -->
     <bool name="def_haptic_feedback">false</bool>
-    
-    <!-- Whether Bluetooth should be switched on by default -->
-    <bool name="def_bluetooth_on">false</bool>
 
 </resources>

overlay/frameworks/base/packages/SystemUI/res/values-sw600dp/dimens.xml

@@ -16,11 +16,11 @@
 */
 -->
 <resources>
+  
+    <!-- Remove custom extra padding for the QS icons and statusbar date -->
+    <dimen name="qs_items_padding">8dp</dimen>
 
     <!-- Width for the spacer, used between QS tiles. -->
     <dimen name="qs_quick_tile_space_width">0dp</dimen>
 
-    <!-- Remove custom extra padding for the QS icons and statusbar date -->
-    <dimen name="qs_items_padding">8dp</dimen>
-
 </resources>

overlay/frameworks/base/packages/SystemUI/res/values/config.xml

@@ -20,11 +20,12 @@
 <!-- These resources are around just to allow their values to be customized
      for different hardware and product builds. -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  
-    <!-- Doze: check proximity sensor before pulsing? -->
-    <bool name="doze_proximity_check_before_pulse">false</bool>
 
     <!-- Max visible notification icons -->
     <integer name="config_maxVisibleNotificationIcons">6</integer>
     <integer name="config_maxVisibleNotificationIconsWhenDark">7</integer>
+
+    <!-- Doze: check proximity sensor before pulsing? -->
+    <bool name="doze_proximity_check_before_pulse">false</bool>
+    
 </resources>

overlay/packages/apps/Bluetooth/res/values/config.xml

@@ -31,7 +31,7 @@
 -->
 <resources>
     <bool name="profile_supported_avrcp_controller">true</bool>
-    <bool name="profile_supported_sap">true</bool>
-    <bool name="profile_supported_hid_device">false</bool>
     <bool name="profile_supported_ba">true</bool>
+    <bool name="profile_supported_hid_device">false</bool>
+    <bool name="profile_supported_sap">true</bool>
 </resources>

overlay/packages/apps/CarrierConfig/res/xml/vendor_device.xml

@@ -101,4 +101,209 @@
     <carrier_config mcc="248" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
-</carrier_config_list>
+    <carrier_config>
+        <boolean name="carrier_volte_available_bool" value="false" />
+        <boolean name="carrier_vt_available_bool" value="false" />
+        <boolean name="config_enable_vt_with_mobile_data_off" value="true" />
+        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="false" />
+        <int name="carrier_default_wfc_ims_mode_int" value="1" />
+    </carrier_config>
+    <carrier_config sdk="26">
+        <boolean name="vilte_data_is_metered_bool" value="false" />
+    </carrier_config>
+    <carrier_config mcc="208" mnc="10" sdk="28">
+        <boolean name="gsm_cdma_calls_can_be_hd_audio" value="true" />
+    </carrier_config>
+    <carrier_config mcc="268" mnc="06">
+        <string name="default_vm_number_string">+351962000000</string>
+    </carrier_config>
+    <carrier_config mcc="334" mnc="020">
+        <boolean name="voicemail_notification_persistent_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="460">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="460" mnc="01,06,09">
+        <boolean name="carrier_volte_available_bool" value="false" />
+        <boolean name="carrier_vt_available_bool" value="false" />
+    </carrier_config>
+    <carrier_config mcc="460" mnc="01,06,09" sdk="28">
+        <boolean name="gsm_cdma_calls_can_be_hd_audio" value="true" />
+    </carrier_config>
+    <carrier_config mcc="460" mnc="03,05,11,12">
+        <boolean name="carrier_volte_available_bool" value="false" />
+        <boolean name="carrier_vt_available_bool" value="false" />
+        <string-array name="apn_hide_rule_strings_array" num="2">
+            <item value="type" />
+            <item value="" />
+        </string-array>
+    </carrier_config>
+    <carrier_config mcc="502" mnc="152">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="404">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="405">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="455" mnc="02,07">
+        <string-array name="apn_hide_rule_strings_array" num="2">
+            <item value="type" />
+            <item value="" />
+        </string-array>
+    </carrier_config>
+    <carrier_config mcc="525" mnc="05" sdk="28">
+        <boolean name="gsm_cdma_calls_can_be_hd_audio" value="true" />
+    </carrier_config>
+    <carrier_config mcc="530" mnc="24">
+        <string name="default_vm_number_string">+64222022002</string>
+    </carrier_config>
+    <carrier_config mcc="234" mnc="20">
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="234" mnc="15">
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <string-array name="read_only_apn_types_string_array" num="0" />
+        <boolean name="voicemail_notification_persistent_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="214" mnc="01">
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="voicemail_notification_persistent_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="262" mnc="02,09">
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <string name="default_vm_number_string">5500</string>
+        <boolean name="voicemail_notification_persistent_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="222" mnc="10">
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="voicemail_notification_persistent_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="268" mnc="01">
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="voicemail_notification_persistent_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="202" mnc="05">
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <string name="default_vm_number_string">121</string>
+        <boolean name="voicemail_notification_persistent_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="208" mnc="10">
+        <string name="default_vm_number_string">123</string>
+        <string-array name="read_only_apn_types_string_array" num="0" />
+        <int name="carrier_default_wfc_ims_mode_int" value="2" />
+    </carrier_config>
+    <carrier_config mcc="208" mnc="20">
+        <string-array name="read_only_apn_types_string_array" num="0" />
+    </carrier_config>
+    <carrier_config mcc="222" mnc="10">
+        <string-array name="read_only_apn_types_string_array" num="0" />
+    </carrier_config>
+    <carrier_config mcc="214" mnc="01">
+        <string name="default_vm_number_string">22177</string>
+        <string-array name="read_only_apn_types_string_array" num="0" />
+    </carrier_config>
+    <carrier_config mcc="214" mnc="03,04,05,06,07,08,16,17,21,32">
+        <string-array name="read_only_apn_types_string_array" num="0" />
+    </carrier_config>
+    <carrier_config mcc="730" mnc="09">
+        <string-array name="non_roaming_operator_string_array" num="4">
+            <item value="73001" />
+            <item value="73002" />
+            <item value="73003" />
+            <item value="73021" />
+        </string-array>
+    </carrier_config>
+    <carrier_config mcc="222" mnc="50">
+        <string-array name="read_only_apn_types_string_array" num="0" />
+    </carrier_config>
+    <carrier_config mcc="208" mnc="15">
+        <string-array name="read_only_apn_types_string_array" num="0" />
+    </carrier_config>
+    <carrier_config mcc="647" mnc="03">
+        <string-array name="read_only_apn_types_string_array" num="0" />
+    </carrier_config>
+    <carrier_config mcc="647" mnc="10">
+        <string-array name="read_only_apn_types_string_array" num="0" />
+    </carrier_config>
+    <carrier_config mcc="272" mnc="02">
+        <string-array name="non_roaming_operator_string_array" num="1">
+            <item value="27205" />
+        </string-array>
+    </carrier_config>
+    <carrier_config mcc="272" mnc="05">
+        <string-array name="non_roaming_operator_string_array" num="1">
+            <item value="27202" />
+        </string-array>
+    </carrier_config>
+    <carrier_config mcc="466" mnc="01">
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="466" mnc="05">
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <int name="carrier_default_wfc_ims_mode_int" value="2" />
+    </carrier_config>
+    <carrier_config mcc="466" mnc="05">
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <int name="carrier_default_wfc_ims_mode_int" value="2" />
+        <int name="wfc_spn_format_idx_int" value="1" />
+        <string-array name="non_roaming_operator_string_array" num="1">
+            <item value="46697" />
+        </string-array>
+        <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="525" mnc="05" gid1="0A">
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <int name="carrier_default_wfc_ims_mode_int" value="2" />
+    </carrier_config>
+    <carrier_config mcc="456" mnc="11">
+        <boolean name="editable_enhanced_4g_lte_bool" value="false" />
+    </carrier_config>
+    <carrier_config mcc="226" mnc="01">
+        <boolean name="config_support_callbarring_over_ims" value="false" />
+    </carrier_config>
+    <carrier_config mcc="214" mnc="01">
+        <boolean name="config_support_callbarring_over_ims" value="false" />
+    </carrier_config>
+    <carrier_config mcc="510" mnc="28">
+        <boolean name="support_video_conference_call_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="286" mnc="02">
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="202" mnc="10">
+        <boolean name="config_callbarring_base_on_volte" value="true" />
+    </carrier_config>
+    <carrier_config mcc="525" mnc="01">
+        <boolean name="config_callbarring_base_on_volte" value="true" />
+    </carrier_config>
+    <carrier_config mcc="730" mnc="09">
+        <string-array name="non_roaming_operator_string_array" num="4">
+            <item value="73001" />
+            <item value="73002" />
+            <item value="73003" />
+            <item value="73021" />
+        </string-array>
+    </carrier_config>
+    <carrier_config mcc="202" mnc="01">
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="732" mnc="101">
+        <string name="default_vm_number_string">*123</string>
+    </carrier_config>
+    <carrier_config mcc="716" mnc="10">
+        <string name="default_vm_number_string">131</string>
+    </carrier_config>
+    <carrier_config mcc="730" mnc="03">
+        <string name="default_vm_number_string">*20</string>
+    </carrier_config>
+    <carrier_config mcc="250" mnc="01">
+        <int name="carrier_default_wfc_ims_mode_int" value="2" />
+    </carrier_config>
+</carrier_config_list>

overlay/packages/apps/CarrierConfig/res/xml/vendor_miui.xml

@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<carrier_config_list>
-    <carrier_config>
-        <boolean name="carrier_volte_available_bool" value="false" />
-        <boolean name="carrier_vt_available_bool" value="false" />
-        <boolean name="config_enable_vt_with_mobile_data_off" value="true" />
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="1" />
-    </carrier_config>
-    <carrier_config sdk="26">
-        <boolean name="vilte_data_is_metered_bool" value="false" />
-    </carrier_config>
-    <carrier_config mcc="208" mnc="10" sdk="28">
-        <boolean name="gsm_cdma_calls_can_be_hd_audio" value="true" />
-    </carrier_config>
-    <carrier_config mcc="268" mnc="06">
-        <string name="default_vm_number_string">+351962000000</string>
-    </carrier_config>
-    <carrier_config mcc="334" mnc="020">
-        <boolean name="voicemail_notification_persistent_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="460">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="460" mnc="01,06,09">
-        <boolean name="carrier_volte_available_bool" value="false" />
-        <boolean name="carrier_vt_available_bool" value="false" />
-    </carrier_config>
-    <carrier_config mcc="460" mnc="01,06,09" sdk="28">
-        <boolean name="gsm_cdma_calls_can_be_hd_audio" value="true" />
-    </carrier_config>
-    <carrier_config mcc="460" mnc="03,05,11,12">
-        <boolean name="carrier_volte_available_bool" value="false" />
-        <boolean name="carrier_vt_available_bool" value="false" />
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type" />
-            <item value="" />
-        </string-array>
-    </carrier_config>
-    <carrier_config mcc="502" mnc="152">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="404">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="405">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="455" mnc="02,07">
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type" />
-            <item value="" />
-        </string-array>
-    </carrier_config>
-    <carrier_config mcc="525" mnc="05" sdk="28">
-        <boolean name="gsm_cdma_calls_can_be_hd_audio" value="true" />
-    </carrier_config>
-    <carrier_config mcc="530" mnc="24">
-        <string name="default_vm_number_string">+64222022002</string>
-    </carrier_config>
-    <carrier_config mcc="234" mnc="20">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="234" mnc="15">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-        <string-array name="read_only_apn_types_string_array" num="0" />
-        <boolean name="voicemail_notification_persistent_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="214" mnc="01">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-        <boolean name="voicemail_notification_persistent_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="262" mnc="02,09">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-        <string name="default_vm_number_string">5500</string>
-        <boolean name="voicemail_notification_persistent_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="222" mnc="10">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-        <boolean name="voicemail_notification_persistent_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="268" mnc="01">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-        <boolean name="voicemail_notification_persistent_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="202" mnc="05">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-        <string name="default_vm_number_string">121</string>
-        <boolean name="voicemail_notification_persistent_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="208" mnc="10">
-        <string name="default_vm_number_string">123</string>
-        <string-array name="read_only_apn_types_string_array" num="0" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-    </carrier_config>
-    <carrier_config mcc="208" mnc="20">
-        <string-array name="read_only_apn_types_string_array" num="0" />
-    </carrier_config>
-    <carrier_config mcc="222" mnc="10">
-        <string-array name="read_only_apn_types_string_array" num="0" />
-    </carrier_config>
-    <carrier_config mcc="214" mnc="01">
-        <string name="default_vm_number_string">22177</string>
-        <string-array name="read_only_apn_types_string_array" num="0" />
-    </carrier_config>
-    <carrier_config mcc="214" mnc="03,04,05,06,07,08,16,17,21,32">
-        <string-array name="read_only_apn_types_string_array" num="0" />
-    </carrier_config>
-    <carrier_config mcc="730" mnc="09">
-        <string-array name="non_roaming_operator_string_array" num="4">
-            <item value="73001" />
-            <item value="73002" />
-            <item value="73003" />
-            <item value="73021" />
-        </string-array>
-    </carrier_config>
-    <carrier_config mcc="222" mnc="50">
-        <string-array name="read_only_apn_types_string_array" num="0" />
-    </carrier_config>
-    <carrier_config mcc="208" mnc="15">
-        <string-array name="read_only_apn_types_string_array" num="0" />
-    </carrier_config>
-    <carrier_config mcc="647" mnc="03">
-        <string-array name="read_only_apn_types_string_array" num="0" />
-    </carrier_config>
-    <carrier_config mcc="647" mnc="10">
-        <string-array name="read_only_apn_types_string_array" num="0" />
-    </carrier_config>
-    <carrier_config mcc="272" mnc="02">
-        <string-array name="non_roaming_operator_string_array" num="1">
-            <item value="27205" />
-        </string-array>
-    </carrier_config>
-    <carrier_config mcc="272" mnc="05">
-        <string-array name="non_roaming_operator_string_array" num="1">
-            <item value="27202" />
-        </string-array>
-    </carrier_config>
-    <carrier_config mcc="466" mnc="01">
-        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="466" mnc="05">
-        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-    </carrier_config>
-    <carrier_config mcc="466" mnc="05">
-        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <int name="wfc_spn_format_idx_int" value="1" />
-        <string-array name="non_roaming_operator_string_array" num="1">
-            <item value="46697" />
-        </string-array>
-        <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="525" mnc="05" gid1="0A">
-        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-    </carrier_config>
-    <carrier_config mcc="456" mnc="11">
-        <boolean name="editable_enhanced_4g_lte_bool" value="false" />
-    </carrier_config>
-    <carrier_config mcc="226" mnc="01">
-        <boolean name="config_support_callbarring_over_ims" value="false" />
-    </carrier_config>
-    <carrier_config mcc="214" mnc="01">
-        <boolean name="config_support_callbarring_over_ims" value="false" />
-    </carrier_config>
-    <carrier_config mcc="510" mnc="28">
-        <boolean name="support_video_conference_call_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="286" mnc="02">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="202" mnc="10">
-        <boolean name="config_callbarring_base_on_volte" value="true" />
-    </carrier_config>
-    <carrier_config mcc="525" mnc="01">
-        <boolean name="config_callbarring_base_on_volte" value="true" />
-    </carrier_config>
-    <carrier_config mcc="730" mnc="09">
-        <string-array name="non_roaming_operator_string_array" num="4">
-            <item value="73001" />
-            <item value="73002" />
-            <item value="73003" />
-            <item value="73021" />
-        </string-array>
-    </carrier_config>
-    <carrier_config mcc="202" mnc="01">
-        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="732" mnc="101">
-        <string name="default_vm_number_string">*123</string>
-    </carrier_config>
-    <carrier_config mcc="716" mnc="10">
-        <string name="default_vm_number_string">131</string>
-    </carrier_config>
-    <carrier_config mcc="730" mnc="03">
-        <string name="default_vm_number_string">*20</string>
-    </carrier_config>
-    <carrier_config mcc="250" mnc="01">
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-    </carrier_config>
-</carrier_config_list>

overlay/packages/apps/Snap/res/values/config.xml

@@ -14,12 +14,12 @@
 <!-- Camera app resources that may need to be customized
      for different hardware or product builds. -->
 <resources>
-    <!-- Enable support for camera api v2 -->
-    <bool name="support_camera_api_v2">true</bool>
-
     <!-- Opens back camera using openLegacy() and forces api v1 -->
     <bool name="back_camera_open_legacy">false</bool>
 
     <!-- Opens front camera using openLegacy() and forces api v1 -->
     <bool name="front_camera_open_legacy">false</bool>
+    
+    <!-- Enable support for camera api v2 -->
+    <bool name="support_camera_api_v2">true</bool>
 </resources>

overlay/packages/services/Telephony/res/values/config.xml

@@ -22,18 +22,14 @@
 <!-- Phone app resources that may need to be customized
      for different hardware or product builds. -->
 <resources>
-    <!-- Flag indicating if hac is enabled -->
-    <bool name="hac_enabled">true</bool>
-
-    <!-- If this is true, the SIM card (through Customer Service Profile EF file) will be
-         able to prevent manual operator selection. If false, this SIM setting will be
-         ignored and manual operator selection will always be available. See
-         CPHS4_2.WW6, CPHS B.4.7.1 for more information -->
-    <bool name="csp_enabled">true</bool>
 
     <!-- Show enabled lte option for lte device -->
     <bool name="config_enabled_lte" translatable="false">true</bool>
-    
+
     <!-- Show Preferred Network Type options in No SIM case -->
     <bool name="config_no_sim_display_network_modes">true</bool>
+
+    <!-- Flag indicating if hac is enabled -->
+    <bool name="hac_enabled">true</bool>
+
 </resources>

overlay/packages/services/Telephony/res/xml/telephony_injection.xml

@@ -32,14 +32,14 @@
         -->
         <!--<component>com.example.componentA</component>-->
         <!--<component>com.example.componentB</component>-->
+        <component>com.android.internal.telephony.dataconnection.DcTracker</component>
+        <component>com.android.internal.telephony.GsmCdmaPhone</component>
+        <component>com.android.internal.telephony.MultiSimSettingController</component>
+        <component>com.android.internal.telephony.PhoneSwitcher</component>
+        <component>com.android.internal.telephony.RIL</component>
         <component>com.android.internal.telephony.ServiceStateTracker</component>
         <component>com.android.internal.telephony.SubscriptionController</component>
         <component>com.android.internal.telephony.SubscriptionInfoUpdater</component>
-        <component>com.android.internal.telephony.GsmCdmaPhone</component>
-        <component>com.android.internal.telephony.PhoneSwitcher</component>
-        <component>com.android.internal.telephony.dataconnection.DcTracker</component>
-        <component>com.android.internal.telephony.RIL</component>
         <component>com.android.internal.telephony.TelephonyComponentFactory</component>
-        <component>com.android.internal.telephony.MultiSimSettingController</component>
     </components>
 </injection>

sdm660.mk

@@ -34,31 +34,296 @@ $(call inherit-product, vendor/xiaomi/sdm660-common/sdm660-common-vendor.mk)
 $(call inherit-product-if-exists, vendor/xiaomi/MiuiCamera/config.mk)
 $(call inherit-product-if-exists, vendor/gapps/common/common-vendor.mk)
 
+# Common Tree Path
 COMMON_PATH := device/xiaomi/sdm660-common
 
 # Inherit properties
-$(call inherit-product, $(COMMON_PATH)/properties.mk)
+$(call inherit-product, $(COMMON_PATH)/common_prop.mk)
 
-# Shims
+# Audio
 PRODUCT_PACKAGES += \
-    camera.sdm660_shim
+    android.hardware.audio@5.0-impl:32 \
+    android.hardware.audio@2.0-service \
+    android.hardware.audio.effect@5.0-impl:32 \
+    android.hardware.audio.effect@2.0-service \
+    android.hardware.soundtrigger@2.2-impl:32 \
+    audio.a2dp.default \
+    audio_amplifier.sdm660 \
+    audio.primary.sdm660 \
+    audio.r_submix.default \
+    audio.usb.default \
+    libaudio-resampler \
+    libqcompostprocbundle \
+    libqcomvisualizer \
+    libqcomvoiceprocessing \
+    libvolumelistener \
+    tinymix.vendor
 
-# RRO
+# Audio Configs
-PRODUCT_ENFORCE_RRO_TARGETS := \
+PRODUCT_COPY_FILES += \
-    framework-res
+    $(COMMON_PATH)/configs/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
+    $(COMMON_PATH)/configs/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \
+    $(COMMON_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
+    $(COMMON_PATH)/configs/audio/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \
+    $(COMMON_PATH)/configs/audio/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml \
+    $(COMMON_PATH)/configs/audio/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml \
+    $(COMMON_PATH)/configs/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \
+    $(COMMON_PATH)/configs/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml
+
+# Audio Policy
+PRODUCT_COPY_FILES += \
+    $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \
+    $(TOPDIR)frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \
+    $(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
+    $(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
+    $(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
+    $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
+
+# ANT+
+PRODUCT_PACKAGES += \
+    AntHalService \
+    antradio_app \
+    com.dsi.ant.antradio_library \
+    libantradio
+
+# ANT Permission
+PRODUCT_COPY_FILES += \
+    external/ant-wireless/antradio-library/com.dsi.ant.antradio_library.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.dsi.ant.antradio_library.xml
+
+# AuthSecret
+PRODUCT_PACKAGES += \
+    android.hardware.authsecret@1.0-service
+
+# Biometrics
+PRODUCT_PACKAGES += \
+    android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660
+
+# Bluetooth
+PRODUCT_PACKAGES += \
+    audio.bluetooth.default \
+    android.hardware.bluetooth.audio@2.0-impl \
+    libbthost_if
 
 # Boot animation
 TARGET_BOOTANIMATION_SIZE := 1080p
 
+# Broadcastradio
+PRODUCT_PACKAGES += \
+    android.hardware.broadcastradio@1.0-impl
+
+# Camera
+PRODUCT_PACKAGES += \
+    android.hardware.camera.provider@2.4-impl:32 \
+    android.hardware.camera.provider@2.4-service \
+    vendor.qti.hardware.camera.device@1.0
+
+# Codec2 modules
+PRODUCT_PACKAGES += \
+    com.android.media.swcodec \
+    libsfplugin_ccodec
+
+# Connectivity Engine support (CNE)
+PRODUCT_PACKAGES += \
+    cneapiclient \
+    com.quicinc.cne \
+    services-ext
+
+# Configstore
+PRODUCT_PACKAGES += \
+    android.hardware.configstore@1.0-service
+
+# Display
+PRODUCT_PACKAGES += \
+    android.frameworks.displayservice@1.0 \
+    android.frameworks.displayservice@1.0_32 \
+    android.hardware.graphics.allocator@2.0-impl:64 \
+    android.hardware.graphics.allocator@2.0-service \
+    android.hardware.graphics.composer@2.1-impl:64 \
+    android.hardware.graphics.composer@2.1-service \
+    android.hardware.graphics.mapper@2.0-impl-2.1 \
+    android.hardware.memtrack@1.0-impl \
+    android.hardware.memtrack@1.0-service \
+    gralloc.sdm660 \
+    hwcomposer.sdm660 \
+    memtrack.sdm660 \
+    libdisplayconfig \
+    liboverlay \
+    libqdMetaData \
+    libqdMetaData.system \
+    libtinyxml \
+    vendor.display.config@1.1 \
+    vendor.display.config@1.1_vendor
+
+# Doze
+PRODUCT_PACKAGES += \
+    XiaomiDoze
+
+# DRM
+PRODUCT_PACKAGES += \
+    android.hardware.drm@1.0-impl \
+    android.hardware.drm@1.0-service \
+    android.hardware.drm@1.2-service.clearkey
+
+# Folio
+PRODUCT_PACKAGES += \
+    folio_daemon
+
+# Freeform Multiwindow
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.software.freeform_window_management.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.freeform_window_management.xml
+
+# Fstab
+PRODUCT_PACKAGES += \
+    fstab.qcom
+
+# fwk-detect
+PRODUCT_PACKAGES += \
+    libqti_vndfwk_detect \
+    libqti_vndfwk_detect.vendor
+
 # GMS
 PRODUCT_GMS_CLIENTID_BASE := android-xiaomi
 
-# Set boot SPL
+# GPS / Location
-BOOT_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH)
+PRODUCT_PACKAGES += \
+    android.hardware.gnss@1.0-impl-qti \
+    android.hardware.gnss@1.0-service-qti \
+    libgnss \
+    libgnsspps \
+    libsensorndkbridge \
+    libsynergy_loc_api
 
-# Soong
+PRODUCT_COPY_FILES += \
-PRODUCT_SOONG_NAMESPACES += \
+    $(COMMON_PATH)/configs/gps/apdr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/apdr.conf \
-    $(COMMON_PATH)
+    $(COMMON_PATH)/configs/gps/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \
+    $(COMMON_PATH)/configs/gps/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \
+    $(COMMON_PATH)/configs/gps/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \
+    $(COMMON_PATH)/configs/gps/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \
+    $(COMMON_PATH)/configs/gps/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \
+    $(COMMON_PATH)/configs/gps/xtwifi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/xtwifi.conf
+
+# Healthd
+PRODUCT_PACKAGES += \
+    android.hardware.health@2.0-service
+
+# HIDL
+PRODUCT_PACKAGES += \
+    android.hidl.base@1.0 \
+    android.hidl.base@1.0_vendor
+
+# HW crypto
+PRODUCT_PACKAGES += \
+    vendor.qti.hardware.cryptfshw@1.0-service-qti
+
+# IDC
+PRODUCT_COPY_FILES += \
+    $(COMMON_PATH)/configs/idc/uinput-fpc.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-fpc.idc \
+    $(COMMON_PATH)/configs/idc/uinput-goodix.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-goodix.idc
+
+# IFAAService
+PRODUCT_PACKAGES += \
+    IFAAService \
+    org.ifaa.android.manager
+
+# IFAA JAR
+PRODUCT_BOOT_JARS += \
+    org.ifaa.android.manager
+
+# IMS
+PRODUCT_PACKAGES += \
+    ims-ext-common_system \
+    ims_ext_common.xml \
+
+# IMS JAR
+PRODUCT_BOOT_JARS += \
+    ims-ext-common_system
+
+# Init
+PRODUCT_PACKAGES += \
+    init.class_main.sh \
+    init.goodix.sh \
+    init.msm.usb.configfs.rc \
+    init.qcom.post_boot.sh \
+    init.qcom.rc \
+    init.qcom.sh \
+    init.qcom.usb.rc \
+    init.qcom.usb.sh \
+    init.qti.fm.sh \
+    init.recovery.qcom.rc \
+    init.target.rc \
+    ueventd.qcom.rc
+
+# Ion
+PRODUCT_PACKAGES += \
+    libion
+
+# IPv6
+PRODUCT_PACKAGES += \
+    ebtables \
+    ethertypes \
+    libebtc
+
+# IRQ
+PRODUCT_COPY_FILES += \
+    $(COMMON_PATH)/configs/msm_irqbalance.conf:$(TARGET_COPY_OUT_VENDOR)/etc/msm_irqbalance.conf
+
+# IRSC
+PRODUCT_COPY_FILES += \
+    $(COMMON_PATH)/configs/sec_config:$(TARGET_COPY_OUT_VENDOR)/etc/sec_config
+
+# Keylayout
+PRODUCT_COPY_FILES += \
+    $(COMMON_PATH)/configs/keylayout/uinput-fpc.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-fpc.kl \
+    $(COMMON_PATH)/configs/keylayout/uinput-goodix.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-goodix.kl
+
+# Lights
+PRODUCT_PACKAGES += \
+    android.hardware.light@2.0-service.xiaomi_sdm660
+
+# LiveDisplay native
+PRODUCT_PACKAGES += \
+    vendor.lineage.livedisplay@2.0-service-sdm
+
+# Media
+PRODUCT_COPY_FILES += \
+    $(COMMON_PATH)/configs/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
+    $(COMMON_PATH)/configs/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml
+
+# Media Google
+PRODUCT_COPY_FILES += \
+    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_video_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video_le.xml
+
+# Media Extensions
+PRODUCT_PACKAGES += \
+    libavmediaserviceextensions \
+    libmediametrics \
+    libregistermsext \
+    mediametrics
+
+# Netutils
+PRODUCT_PACKAGES += \
+    android.system.net.netd@1.0 \
+    libandroid_net \
+    netutils-wrapper-1.0
+
+# OMX
+PRODUCT_PACKAGES += \
+    libc2dcolorconvert \
+    libextmedia_jni \
+    libhypv_intercept \
+    libmm-omxcore \
+    libOmxCore \
+    libOmxAacEnc \
+    libOmxAmrEnc \
+    libOmxEvrcEnc \
+    libOmxG711Enc \
+    libOmxQcelp13Enc \
+    libOmxVdec \
+    libOmxVenc \
+    libstagefrighthw
 
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += \
@@ -66,11 +331,6 @@ DEVICE_PACKAGE_OVERLAYS += \
     $(COMMON_PATH)/overlay-lineage
 
 # Permissions
-PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/configs/privapp-permissions-qti-product.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-qti.xml \
-    $(COMMON_PATH)/configs/privapp-permissions-qti-system.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \
-    $(COMMON_PATH)/configs/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-hotword.xml
-
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \
     frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml \
@@ -114,275 +374,6 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.vulkan.version-1_0_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version-1_0_3.xml \
     frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml
 
-# Audio
-PRODUCT_PACKAGES += \
-    android.hardware.audio@5.0-impl:32 \
-    android.hardware.audio@2.0-service \
-    android.hardware.audio.effect@5.0-impl:32 \
-    android.hardware.audio.effect@2.0-service \
-    android.hardware.soundtrigger@2.2-impl:32 \
-    audio.a2dp.default \
-    audio_amplifier.sdm660 \
-    audio.primary.sdm660 \
-    audio.r_submix.default \
-    audio.usb.default \
-    libaudio-resampler \
-    libqcompostprocbundle \
-    libqcomvisualizer \
-    libqcomvoiceprocessing \
-    libvolumelistener \
-    tinymix.vendor
-
-PRODUCT_PACKAGES += \
-    audio.bluetooth.default \
-    android.hardware.bluetooth.audio@2.0-impl
-
-PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
-    $(COMMON_PATH)/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \
-    $(COMMON_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
-    $(COMMON_PATH)/audio/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml \
-    $(COMMON_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \
-    $(COMMON_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \
-    $(COMMON_PATH)/audio/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \
-    $(COMMON_PATH)/audio/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml
-
-PRODUCT_COPY_FILES += \
-    $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \
-    $(TOPDIR)frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \
-    $(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
-    $(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
-    $(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
-    $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
-
-# ANT+
-PRODUCT_PACKAGES += \
-    AntHalService \
-    antradio_app \
-    com.dsi.ant.antradio_library \
-    libantradio
-
-PRODUCT_COPY_FILES += \
-    external/ant-wireless/antradio-library/com.dsi.ant.antradio_library.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.dsi.ant.antradio_library.xml
-
-# AuthSecret 
-PRODUCT_PACKAGES += \
-    android.hardware.authsecret@1.0-service
-
-# Biometrics
-PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660
-
-PRODUCT_PACKAGES += \
-    IFAAService \
-    org.ifaa.android.manager
-
-PRODUCT_BOOT_JARS += \
-    org.ifaa.android.manager
-
-# Bluetooth
-PRODUCT_PACKAGES += \
-    libbthost_if
-
-PRODUCT_PACKAGES += \
-    libMiWatermark_shim \
-
-PRODUCT_PACKAGES += \
-    android.frameworks.displayservice@1.0_32 \
-    android.hardware.camera.provider@2.4-impl:32 \
-    android.hardware.camera.provider@2.4-service \
-    vendor.qti.hardware.camera.device@1.0
-
-# Codec2 modules
-PRODUCT_PACKAGES += \
-    com.android.media.swcodec \
-    libsfplugin_ccodec
-
-# Connectivity Engine support (CNE)
-PRODUCT_PACKAGES += \
-    cneapiclient \
-    com.quicinc.cne \
-    services-ext
-
-# Configstore
-PRODUCT_PACKAGES += \
-    android.hardware.configstore@1.0-service
-
-# Display
-PRODUCT_PACKAGES += \
-    gralloc.sdm660 \
-    hwcomposer.sdm660 \
-    memtrack.sdm660 \
-    libdisplayconfig \
-    liboverlay \
-    libtinyxml \
-    libqdMetaData \
-    libqdMetaData.system
-
-PRODUCT_PACKAGES += \
-    android.hardware.graphics.allocator@2.0-impl:64 \
-    android.hardware.graphics.allocator@2.0-service \
-    android.hardware.graphics.mapper@2.0-impl-2.1 \
-    android.hardware.graphics.composer@2.1-impl:64 \
-    android.hardware.graphics.composer@2.1-service \
-    android.hardware.memtrack@1.0-impl \
-    android.hardware.memtrack@1.0-service \
-    android.hardware.renderscript@1.0-impl \
-    android.frameworks.displayservice@1.0 \
-    vendor.display.config@1.1 \
-    vendor.display.config@1.1_vendor
-
-# Doze
-PRODUCT_PACKAGES += \
-   XiaomiDoze
-
-# DRM
-PRODUCT_PACKAGES += \
-    android.hardware.drm@1.0-impl \
-    android.hardware.drm@1.0-service \
-    android.hardware.drm@1.2-service.clearkey
-
-PRODUCT_PACKAGES += \
-    android.hardware.broadcastradio@1.0-impl
-
-# Freeform Multiwindow
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.software.freeform_window_management.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.freeform_window_management.xml
-
-# Folio
-PRODUCT_PACKAGES += \
-    folio_daemon
-
-# fwk-detect
-PRODUCT_PACKAGES += \
-    libqti_vndfwk_detect \
-    libqti_vndfwk_detect.vendor
-
-
-# GPS / Location
-PRODUCT_PACKAGES += \
-    android.hardware.gnss@1.0-impl-qti \
-    android.hardware.gnss@1.0-service-qti \
-    libgnss \
-    libgnsspps \
-    libsensorndkbridge \
-    libsynergy_loc_api
-
-PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/configs/gps/apdr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/apdr.conf \
-    $(COMMON_PATH)/configs/gps/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \
-    $(COMMON_PATH)/configs/gps/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \
-    $(COMMON_PATH)/configs/gps/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \
-    $(COMMON_PATH)/configs/gps/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \
-    $(COMMON_PATH)/configs/gps/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \
-    $(COMMON_PATH)/configs/gps/xtwifi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/xtwifi.conf
-
-# Healthd
-PRODUCT_PACKAGES += \
-    android.hardware.health@2.0-service
-
-# HIDL
-PRODUCT_PACKAGES += \
-    android.hidl.base@1.0 \
-    android.hidl.base@1.0_vendor
-
-# HW crypto
-PRODUCT_PACKAGES += \
-    vendor.qti.hardware.cryptfshw@1.0-service-qti
-
-# IDC
-PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/idc/uinput-fpc.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-fpc.idc \
-    $(COMMON_PATH)/idc/uinput-goodix.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-goodix.idc
-
-# Init
-PRODUCT_PACKAGES += \
-    init.class_main.sh \
-    init.goodix.sh \
-    move_wifi_data.sh \
-    init.msm.usb.configfs.rc \
-    init.qcom.post_boot.sh \
-    init.qcom.rc \
-    init.qcom.sh \
-    init.qcom.usb.rc \
-    init.qcom.usb.sh \
-    init.qti.fm.sh \
-    init.recovery.qcom.rc \
-    init.target.rc \
-    ueventd.qcom.rc \
-    fstab.qcom
-
-# Ion
-PRODUCT_PACKAGES += \
-    libion
-
-# IPv6
-PRODUCT_PACKAGES += \
-    ebtables \
-    ethertypes \
-    libebtc
-
-# IRQ
-PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/configs/msm_irqbalance.conf:$(TARGET_COPY_OUT_VENDOR)/etc/msm_irqbalance.conf
-
-# IRSC
-PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/configs/sec_config:$(TARGET_COPY_OUT_VENDOR)/etc/sec_config
-
-# Keylayout
-PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/configs/keylayout/uinput-fpc.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-fpc.kl \
-    $(COMMON_PATH)/configs/keylayout/uinput-goodix.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-goodix.kl
-
-# Lights
-PRODUCT_PACKAGES += \
-    android.hardware.light@2.0-service.xiaomi_sdm660
-
-# LiveDisplay native
-PRODUCT_PACKAGES += \
-    vendor.lineage.livedisplay@2.0-service-sdm
-
-# Media
-PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/configs/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
-    $(COMMON_PATH)/configs/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml
-
-PRODUCT_COPY_FILES += \
-    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_video_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video_le.xml
-
-# Media Extensions
-PRODUCT_PACKAGES += \
-    libavmediaserviceextensions \
-    libmediametrics \
-    libregistermsext \
-    mediametrics
-
-# Netutils
-PRODUCT_PACKAGES += \
-    android.system.net.netd@1.0 \
-    libandroid_net \
-    netutils-wrapper-1.0
-
-# OMX
-PRODUCT_PACKAGES += \
-    libc2dcolorconvert \
-    libextmedia_jni \
-    libhypv_intercept \
-    libmm-omxcore \
-    libOmxCore \
-    libOmxAacEnc \
-    libOmxAmrEnc \
-    libOmxEvrcEnc \
-    libOmxG711Enc \
-    libOmxQcelp13Enc \
-    libOmxVdec \
-    libOmxVenc \
-    libstagefrighthw
-
 # Power
 PRODUCT_PACKAGES += \
     android.hardware.power@1.2-service-qti
@@ -390,6 +381,12 @@ PRODUCT_PACKAGES += \
 # Preopt SystemUI
 PRODUCT_DEXPREOPT_SPEED_APPS += SystemUI
 
+# Privapp-Permissions
+PRODUCT_COPY_FILES += \
+    $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-qti-product.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-qti.xml \
+    $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-qti-system.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \
+    $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-hotword.xml
+
 # Public Libraries
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/configs/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt
@@ -397,7 +394,7 @@ PRODUCT_COPY_FILES += \
 # Low power Whitelist
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/configs/qti_whitelist.xml:system/etc/sysconfig/qti_whitelist.xml \
-    $(COMMON_PATH)/configs/whitelistedapps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/whitelistedapps.xml \
+    $(COMMON_PATH)/configs/perf/whitelistedapps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/whitelistedapps.xml \
 
 # QMI
 PRODUCT_PACKAGES += \
@@ -424,24 +421,24 @@ PRODUCT_PACKAGES += \
     android.hardware.radio@1.2 \
     android.hardware.radio.config@1.0 \
     android.hardware.secure_element@1.0 \
-    rild \
     librmnetctl \
     libxml2 \
-    libprotobuf-cpp-full
+    libprotobuf-cpp-full \
-
-PRODUCT_PACKAGES += \
-    ims-ext-common_system \
-    ims_ext_common.xml \
     qti-telephony-hidl-wrapper \
     qti_telephony_hidl_wrapper.xml \
     qti-telephony-utils \
     qti_telephony_utils.xml \
+    rild \
     telephony-ext
 
+# RIL JAR
 PRODUCT_BOOT_JARS += \
-    ims-ext-common_system \
     telephony-ext
 
+# RRO
+PRODUCT_ENFORCE_RRO_TARGETS := \
+    framework-res
+
 # Seccomp policy
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/seccomp/mediacodec-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
@@ -452,8 +449,21 @@ PRODUCT_PACKAGES += \
     android.hardware.sensors@1.0-impl:64 \
     android.hardware.sensors@1.0-service
 
+# Sensor Config
 PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf
+    $(COMMON_PATH)/configs/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf
+
+# Security Patch
+BOOT_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH)
+
+# Shims
+PRODUCT_PACKAGES += \
+    camera.sdm660_shim \
+    libMiWatermark_shim
+
+# Soong
+PRODUCT_SOONG_NAMESPACES += \
+    $(COMMON_PATH)
 
 # Tetheroffload
 PRODUCT_PACKAGES += \
@@ -473,7 +483,7 @@ PRODUCT_PACKAGES += \
     android.hardware.thermal@1.0-service \
     thermal.sdm660
 
-# ThermalController app
+# Thermal Controller
 PRODUCT_PACKAGES += \
    ThermalController
 
@@ -488,7 +498,7 @@ PRODUCT_PACKAGES += \
     vndk-ext \
     vndk_package
 
-# Wifi
+# WiFi
 PRODUCT_PACKAGES += \
     android.hardware.wifi@1.0-service \
     hostapd \
@@ -498,16 +508,18 @@ PRODUCT_PACKAGES += \
     wpa_supplicant.conf \
     wpa_cli
 
+# WiFi Configs
 PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
+    $(COMMON_PATH)/configs/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
-    $(COMMON_PATH)/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
+    $(COMMON_PATH)/configs/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
-    $(COMMON_PATH)/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini
+    $(COMMON_PATH)/configs/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini
 
 # WiFi Display
 PRODUCT_PACKAGES += \
     libaacwrapper \
     libnl
 
+# WiFi Display JAR
 PRODUCT_BOOT_JARS += \
     WfdCommon