diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-10-04 00:09:10 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-10-04 00:09:10 +0000 |
| commit | 7ac17bfe0f460242fe653250f24819ba5e46cc1e (patch) | |
| tree | 093288f527f2b6a37b2ad1be6871342cb04b57ff | |
| parent | 565024be497515dc41ab77512ba4d1bfe7ed4bca (diff) | |
| parent | 5866e040593af25469382646e906cbbd93f6e334 (diff) | |
| download | bonito-android10-qpr1-b-release.tar.gz | |
Merge cherrypicks of [9500481, 9500482, 9500499, 9500334, 9500335, 9500400, 9500401, 9500402, 9500403, 9500608, 9500558, 9500559, 9500560, 9500561] into qt-qpr1-releaseandroid-10.0.0_r27android-10.0.0_r23android-10.0.0_r19android-10.0.0_r18android10-qpr1-b-s1-releaseandroid10-qpr1-b-release
Change-Id: Ic6f1c85503b8c63a112f7d526545e21add551be8
| -rw-r--r-- | device.mk | 3 | ||||
| -rw-r--r-- | fstab.hardware | 2 | ||||
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 2 |
3 files changed, 1 insertions, 6 deletions
@@ -324,9 +324,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.rcs.supported=1 \ vendor.rild.libpath=/vendor/lib64/libril-qc-hal-qmi.so \ ro.hardware.keystore_desede=true \ - ro.zram.mark_idle_delay_mins=60 \ - ro.zram.first_wb_delay_mins=180 \ - ro.zram.periodic_wb_delay_hours=24 \ # Disable snapshot timer PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/fstab.hardware b/fstab.hardware index aa9a63db..422c9ccf 100644 --- a/fstab.hardware +++ b/fstab.hardware @@ -17,5 +17,5 @@ product /product # and fails if it does not find it. /dev/block/bootdevice/by-name/misc /misc emmc defaults defaults /devices/platform/soc/a600000.ssusb/a600000.dwc3/xhci-hcd.*.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg: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 /dev/block/platform/soc/7c4000.sdhci/by-name/persist /mnt/vendor/persist ext4 nosuid,nodev,noatime,barrier=1 wait,first_stage_mount diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 1708b4a7..bef2559c 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -410,6 +410,4 @@ <!-- True if the firmware supports connected MAC randomization --> <bool name="config_wifi_connected_mac_randomization_supported">true</bool> - <!-- Enable Zram writeback feature to allow unused pages in zram be written to flash. --> - <bool name="config_zramWriteback">true</bool> </resources> |