commit cf74a2ce3136589bbaf858f79539bbccf298ea21
author Daeho Jeong <daehojeong@google.com> Tue Oct 01 16:49:22 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 01 16:49:22 2024 +0000
tree fcf3770cad3085dc3216379d6469d9d31fdbfba9
parent 6caaf2f3e464807940ede306033f0bb4055e9268
parent 1573f5d7b44d58b3dd2b0c8503c5e4b22d16c32d

Merge "Turn off smart idle maint service for ZUFS" into main

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

diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index b35959f..0c7840c 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -2738,7 +2738,8 @@
         boolean smartIdleMaintEnabled = DeviceConfig.getBoolean(
             DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
             "smart_idle_maint_enabled",
-            DEFAULT_SMART_IDLE_MAINT_ENABLED);
+                DEFAULT_SMART_IDLE_MAINT_ENABLED)
+                && !SystemProperties.getBoolean("ro.boot.zufs_provisioned", false);
         if (smartIdleMaintEnabled) {
             mLifetimePercentThreshold = DeviceConfig.getInt(
                 DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,