diff --git a/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt b/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt index cbad4349dd..6ad5f89b64 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt @@ -26,10 +26,12 @@ object PhantomProcessLimit { usesDeviceConfig(sdk) && enabled -> listOf( "device_config delete activity_manager max_phantom_processes", "device_config set_sync_disabled_for_tests none", + "settings put global $SETTING true", ) usesDeviceConfig(sdk) -> listOf( "device_config set_sync_disabled_for_tests persistent", "device_config put activity_manager max_phantom_processes $MAX_PHANTOM", + "settings put global $SETTING false", ) else -> listOf("settings put global $SETTING ${if (enabled) "true" else "false"}") } @@ -57,7 +59,12 @@ object PhantomProcessLimit { if (sdk < Build.VERSION_CODES.S) return PhantomProcessStatus.NOT_APPLICABLE if (usesDeviceConfig(sdk)) { val off = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getBoolean(PREF_ANDROID_12_OFF, false) - return if (off) PhantomProcessStatus.DISABLED else PhantomProcessStatus.UNREADABLE + val global = try { + Settings.Global.getString(context.contentResolver, SETTING) + } catch (_: Exception) { + null + } + return android12Status(off, global, systemProperty(OVERRIDE_PROPERTY)) } val global = try { Settings.Global.getString(context.contentResolver, SETTING) @@ -67,6 +74,10 @@ object PhantomProcessLimit { return status(global, systemProperty(OVERRIDE_PROPERTY)) } + fun android12Status(rememberedOff: Boolean, global: String?, override: String?): PhantomProcessStatus = + if (rememberedOff || status(global, override) == PhantomProcessStatus.DISABLED) PhantomProcessStatus.DISABLED + else PhantomProcessStatus.UNREADABLE + fun status(global: String?, override: String?): PhantomProcessStatus { val value = global?.trim()?.lowercase()?.takeIf { it.isNotEmpty() } ?: override?.trim()?.lowercase()?.takeIf { it.isNotEmpty() } diff --git a/app/src/test/java/com/droiddeck/launcher/core/PhantomProcessLimitTest.kt b/app/src/test/java/com/droiddeck/launcher/core/PhantomProcessLimitTest.kt index e930f85e51..e1f0b1af3f 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/PhantomProcessLimitTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/PhantomProcessLimitTest.kt @@ -35,11 +35,17 @@ class PhantomProcessLimitTest { listOf( "device_config set_sync_disabled_for_tests persistent", "device_config put activity_manager max_phantom_processes 2147483647", + "settings put global settings_enable_monitor_phantom_procs false", ), PhantomProcessLimit.shellCommands(enabled = false, sdk = 31), ) assertTrue(PhantomProcessLimit.verified("2147483647\n", enabled = false, sdk = 31)) assertFalse(PhantomProcessLimit.verified("null", enabled = false, sdk = 31)) + assertEquals(PhantomProcessStatus.DISABLED, PhantomProcessLimit.android12Status(true, null, null)) + assertEquals(PhantomProcessStatus.DISABLED, PhantomProcessLimit.android12Status(false, "false", null)) + assertEquals(PhantomProcessStatus.DISABLED, PhantomProcessLimit.android12Status(false, null, "0")) + assertEquals(PhantomProcessStatus.UNREADABLE, PhantomProcessLimit.android12Status(false, null, null)) + assertEquals(PhantomProcessStatus.UNREADABLE, PhantomProcessLimit.android12Status(false, "true", null)) } @Test