From 73be6dca46e44d0cc2a63b0f4d998be69e5f9721 Mon Sep 17 00:00:00 2001
From: Alexander Winkowski <dereference23@outlook.com>
Date: Thu, 26 May 2022 12:43:35 +0000
Subject: [PATCH] sm6250-common: Remove zram writeback leftovers

It has been disabled in kernel because of memory corruption.

Change-Id: I50e4cdc39b38a510d39032253606ddec3e41d22c
---
 overlay/frameworks/base/core/res/res/values/config.xml | 3 ---
 rootdir/etc/fstab.qcom                                 | 2 +-
 sepolicy/vendor/file.te                                | 2 --
 sepolicy/vendor/file_contexts                          | 3 ---
 sepolicy/vendor/kernel.te                              | 2 --
 sepolicy/vendor/toolbox.te                             | 2 --
 vendor.prop                                            | 5 -----
 7 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 sepolicy/vendor/kernel.te
 delete mode 100644 sepolicy/vendor/toolbox.te

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 565acba..f923be7 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -289,9 +289,6 @@
          in hardware. -->
     <bool name="config_setColorTransformAccelerated">true</bool>
 
-    <!-- Enable Zram writeback feature to allow unused pages in zram be written to flash. -->
-    <bool name="config_zramWriteback">true</bool>
-
     <!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
          when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
          where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 495a362..4d477c0 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -49,4 +49,4 @@ vendor                                                  /vendor
 # The update_engine code looks for this entry in order to determine the boot device address
 # and fails if it does not find it.
 /dev/block/bootdevice/by-name/misc                      /misc              emmc    defaults                                             defaults
-/dev/block/zram0                                        none               swap    defaults                                             zramsize=50%,zram_backingdev_size=512M
+/dev/block/zram0                                        none               swap    defaults                                             zramsize=50%
diff --git a/sepolicy/vendor/file.te b/sepolicy/vendor/file.te
index 28507d2..f26fafe 100644
--- a/sepolicy/vendor/file.te
+++ b/sepolicy/vendor/file.te
@@ -4,8 +4,6 @@ type camera_persist_file, file_type, vendor_persist_type;
 
 type fingerprint_data_file, data_file_type, file_type, vendor_persist_type;
 
-type per_boot_file, file_type, data_file_type, core_data_file_type;
-
 type persist_subsys_file, vendor_persist_type, file_type;
 
 type public_adsprpcd_file, file_type;
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 7684458..765ce1f 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -28,9 +28,6 @@
 # Lights
 /vendor/bin/hw/android\.hardware\.lights-service\.xiaomi_atoll          u:object_r:hal_light_default_exec:s0
 
-# Per-boot files
-/data/per_boot(/.*)?                                                    u:object_r:per_boot_file:s0
-
 # Persist subsystem
 /mnt/vendor/persist/subsys(/.*)?                                        u:object_r:persist_subsys_file:s0
 
diff --git a/sepolicy/vendor/kernel.te b/sepolicy/vendor/kernel.te
deleted file mode 100644
index 894fa19..0000000
--- a/sepolicy/vendor/kernel.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# For zram writeback
-allow kernel per_boot_file:file r_file_perms;
diff --git a/sepolicy/vendor/toolbox.te b/sepolicy/vendor/toolbox.te
deleted file mode 100644
index b12911a..0000000
--- a/sepolicy/vendor/toolbox.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow toolbox per_boot_file:dir create_dir_perms;
-allow toolbox per_boot_file:file create_file_perms;
diff --git a/vendor.prop b/vendor.prop
index f974392..5d6e9b3 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -199,8 +199,3 @@ ro.config.vc_call_vol_steps=10
 
 # WiFi
 wifi.aware.interface=wifi-aware0
-
-# ZRAM
-ro.zram.first_wb_delay_mins=180
-ro.zram.mark_idle_delay_mins=60
-ro.zram.periodic_wb_delay_hours=24