Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2682f595 authored by Shin Kawamura's avatar Shin Kawamura Committed by Automerger Merge Worker
Browse files

Merge "Switch zram management based on mmd AConfig flag and mmd.zram.enabled... 

Merge "Switch zram management based on mmd AConfig flag and mmd.zram.enabled system property" into main am: 632e81ae am: 1f1a5d50

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3469369



Change-Id: Ie5b760b12ed2ff956ffdd1032ed5da0331002a82
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4fdd2c26 1f1a5d50

services/core/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ java_library_static { 
        "aconfig_new_storage_flags_lib",

        "powerstats_flags_lib",

        "locksettings_flags_lib",

        "MmdProperties",

        "mmd_flags_lib",

        "profiling_flags_lib",

        "android.adpf.sessionmanager_aidl-java",

services/core/java/com/android/server/StorageManagerService.java

+15 −14
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ import android.provider.Downloads; 
import android.provider.MediaStore;

import android.provider.Settings;

import android.service.storage.ExternalStorageService;

import android.sysprop.MmdProperties;

import android.text.TextUtils;

import android.text.format.DateUtils;

import android.util.ArrayMap;
@@ -935,6 +936,9 @@ class StorageManagerService extends IStorageManager.Stub 
        // Start scheduling nominally-daily fstrim operations

        MountServiceIdler.scheduleIdlePass(mContext);



        if (mmdEnabled() && MmdProperties.mmd_zram_enabled().orElse(false)) {

            ZramMaintenance.startZramMaintenance(mContext);

        } else {

            // Toggle zram-enable system property in response to settings

            mContext.getContentResolver().registerContentObserver(

                    Settings.Global.getUriFor(Settings.Global.ZRAM_ENABLED),
@@ -947,9 +951,6 @@ class StorageManagerService extends IStorageManager.Stub 
                    });

            refreshZramSettings();



        if (mmdEnabled()) {

            ZramMaintenance.startZramMaintenance(mContext);

        } else {

            // Schedule zram writeback unless zram is disabled by persist.sys.zram_enabled

            String zramPropValue = SystemProperties.get(ZRAM_ENABLED_PROPERTY);

            if (!zramPropValue.equals("0")
@@ -983,7 +984,7 @@ class StorageManagerService extends IStorageManager.Stub 
            // sole writer.

            SystemProperties.set(ZRAM_ENABLED_PROPERTY, desiredPropertyValue);

            // Schedule writeback only if zram is being enabled.

            if (!mmdEnabled() && desiredPropertyValue.equals("1")

            if (desiredPropertyValue.equals("1")

                    && mContext.getResources().getBoolean(

                        com.android.internal.R.bool.config_zramWriteback)) {

                ZramWriteback.scheduleZramWriteback(mContext);