Revert "fstab: Revert "Revert "Enable zram writeback"""
Let's disable zram-writeback.
This reverts commit 96e728a88b8b2c9c6448aea4723a0d8f354b9a1a.
Bug: 141860559
Change-Id: I228572e6a02b7ee4fbf91f94a9a3cedb61ee8999
Signed-off-by: Minchan Kim <minchan@google.com>
diff --git a/device.mk b/device.mk
index 1288a26..4614907 100644
--- a/device.mk
+++ b/device.mk
@@ -944,12 +944,6 @@
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
-# ZRAM writeback
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.zram.mark_idle_delay_mins=60 \
- ro.zram.first_wb_delay_mins=180 \
- ro.zram.periodic_wb_delay_hours=24
-
# Disable SPU usage
PRODUCT_PROPERTY_OVERRIDES += \
vendor.gatekeeper.disable_spu = true
diff --git a/fstab.hardware b/fstab.hardware
index 2b6480e..69f9310 100644
--- a/fstab.hardware
+++ b/fstab.hardware
@@ -9,4 +9,4 @@
/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier latemount,wait,check,quota,formattable,fileencryption=ice,reservedsize=128M,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,keydirectory=/metadata/vold/metadata_encryption,checkpoint=fs
/devices/platform/soc/a600000.ssusb/a600000.dwc3* auto vfat defaults voldmanaged=usb:auto
-/dev/block/zram0 none swap defaults zramsize=2147483648,max_comp_streams=8,zram_loopback_path=/data/per_boot/zram_swap,zram_loopback_size=512M
+/dev/block/zram0 none swap defaults zramsize=2147483648,max_comp_streams=8
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 6708b29..da39fbf 100755
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -541,8 +541,6 @@
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>
- <!-- Enable Zram writeback feature to allow unused pages in zram be written to flash. -->
- <bool name="config_zramWriteback">true</bool>
<!-- True if the firmware supports connected MAC randomization -->
<bool name="config_wifi_connected_mac_randomization_supported">true</bool>
