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

Commit 30088016 authored by Jernej Virag's avatar Jernej Virag
Browse files

Clean up flag `qs_register_setting_observer_on_bg_thread`

The flag has been launched and is safe to remove now.

Bug: 409605642
Flag: EXEMPT cleanup
Test: atest UserSettingObserverTest
Change-Id: I7dd22ffce49e74e826f26fc3858820681278de4a
parent 00970c7e
Loading
Loading
Loading
Loading
+0 −10
Original line number Diff line number Diff line
@@ -1288,16 +1288,6 @@ flag {
   }
}

flag {
  namespace: "systemui"
  name: "qs_register_setting_observer_on_bg_thread"
  description: "Registers Quick Settings content providers on background thread"
  bug: "351766769"
  metadata {
    purpose: PURPOSE_BUGFIX
  }
}

flag {
  name: "sounddose_customization"
  namespace: "systemui"
+0 −23
Original line number Diff line number Diff line
@@ -18,11 +18,8 @@ package com.android.systemui.qs
import android.net.Uri
import android.os.Handler
import android.os.Looper
import android.platform.test.annotations.DisableFlags
import android.platform.test.annotations.EnableFlags
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SmallTest
import com.android.systemui.Flags
import com.android.systemui.SysuiTestCase
import com.android.systemui.util.settings.SettingObserver
import com.android.systemui.util.settings.SettingsProxy
@@ -70,7 +67,6 @@ class SettingObserverTest : SysuiTestCase() {
    }

    @Test
    @EnableFlags(Flags.FLAG_QS_REGISTER_SETTING_OBSERVER_ON_BG_THREAD)
    fun setListening_true_settingsProxyRegistered() {
        testSettingObserver.isListening = true
        verify(settingsProxy)
@@ -89,7 +85,6 @@ class SettingObserverTest : SysuiTestCase() {
    }

    @Test
    @EnableFlags(Flags.FLAG_QS_REGISTER_SETTING_OBSERVER_ON_BG_THREAD)
    fun setListening_false_settingsProxyRegistered() {
        testSettingObserver.isListening = true
        reset(settingsProxy)
@@ -97,22 +92,4 @@ class SettingObserverTest : SysuiTestCase() {

        verify(settingsProxy).unregisterContentObserverAsync(eq(testSettingObserver))
    }

    @Test
    @DisableFlags(Flags.FLAG_QS_REGISTER_SETTING_OBSERVER_ON_BG_THREAD)
    fun setListening_bgFlagDisabled_true_settingsProxyRegistered() {
        testSettingObserver.isListening = true
        verify(settingsProxy)
            .registerContentObserverSync(any<Uri>(), eq(false), eq(testSettingObserver))
    }

    @Test
    @DisableFlags(Flags.FLAG_QS_REGISTER_SETTING_OBSERVER_ON_BG_THREAD)
    fun setListening_bgFlagDisabled_false_settingsProxyRegistered() {
        testSettingObserver.isListening = true
        reset(settingsProxy)
        testSettingObserver.isListening = false

        verify(settingsProxy).unregisterContentObserverSync(eq(testSettingObserver))
    }
}
+3 −17
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@
package com.android.systemui.qs

import android.os.Handler
import android.platform.test.flag.junit.FlagsParameterization
import android.testing.TestableLooper
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SmallTest
import com.android.systemui.Flags
import com.android.systemui.SysuiTestCase
@@ -34,15 +34,13 @@ import org.junit.After
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import platform.test.runner.parameterized.ParameterizedAndroidJunit4
import platform.test.runner.parameterized.Parameters

private typealias Callback = (Int, Boolean) -> Unit

@SmallTest
@RunWith(ParameterizedAndroidJunit4::class)
@RunWith(AndroidJUnit4::class)
@TestableLooper.RunWithLooper
class UserSettingObserverTest(flags: FlagsParameterization) : SysuiTestCase() {
class UserSettingObserverTest : SysuiTestCase() {

    companion object {
        private const val TEST_SETTING = "setting"
@@ -50,18 +48,6 @@ class UserSettingObserverTest(flags: FlagsParameterization) : SysuiTestCase() {
        private const val OTHER_USER = 1
        private const val DEFAULT_VALUE = 1
        private val FAIL_CALLBACK: Callback = { _, _ -> fail("Callback should not be called") }

        @JvmStatic
        @Parameters(name = "{0}")
        fun getParams(): List<FlagsParameterization> {
            return FlagsParameterization.allCombinationsOf(
                Flags.FLAG_QS_REGISTER_SETTING_OBSERVER_ON_BG_THREAD
            )
        }
    }

    init {
        mSetFlagsRule.setFlagsParameterization(flags)
    }

    private val kosmos = testKosmos()
+4 −13
Original line number Diff line number Diff line
@@ -71,20 +71,11 @@ public abstract class SettingObserver extends ContentObserver {
        mListening = listening;
        if (listening) {
            mObservedValue = getValueFromProvider();
            if (Flags.qsRegisterSettingObserverOnBgThread()) {
            mSettingsProxy.registerContentObserverAsync(
                    mSettingsProxy.getUriFor(mSettingName), false, this,
                    () -> mObservedValue = getValueFromProvider());
        } else {
                mSettingsProxy.registerContentObserverSync(
                        mSettingsProxy.getUriFor(mSettingName), false, this);
            }
        } else {
            if (Flags.qsRegisterSettingObserverOnBgThread()) {
            mSettingsProxy.unregisterContentObserverAsync(this);
            } else {
                mSettingsProxy.unregisterContentObserverSync(this);
            }
            mObservedValue = mDefaultValue;
        }
    }
+4 −13
Original line number Diff line number Diff line
@@ -77,20 +77,11 @@ public abstract class UserSettingObserver extends ContentObserver implements Lis
        mListening = listening;
        if (listening) {
            mObservedValue = getValueFromProvider();
            if (Flags.qsRegisterSettingObserverOnBgThread()) {
            mSettingsProxy.registerContentObserverForUserAsync(
                mSettingsProxy.getUriFor(mSettingName), this, mUserId, () ->
                    mObservedValue = getValueFromProvider());
        } else {
                mSettingsProxy.registerContentObserverForUserSync(
                        mSettingsProxy.getUriFor(mSettingName), false, this, mUserId);
            }
        } else {
            if (Flags.qsRegisterSettingObserverOnBgThread()) {
            mSettingsProxy.unregisterContentObserverAsync(this);
            } else {
                mSettingsProxy.unregisterContentObserverSync(this);
            }
            mObservedValue = mDefaultValue;
        }
    }