diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java | 16 | ||||
| -rw-r--r-- | packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java | 6 |
2 files changed, 17 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java index 7ae840938fe7..e07b5c228585 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java @@ -48,6 +48,7 @@ import com.android.internal.R; import com.android.internal.logging.UiEvent; import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.UiEventLoggerImpl; +import com.android.systemui.Flags; import com.android.systemui.biometrics.AuthController; import com.android.systemui.plugins.SensorManagerPlugin; import com.android.systemui.statusbar.phone.DozeParameters; @@ -426,7 +427,11 @@ public class DozeSensors { } if (!anyListening) { - mSecureSettings.unregisterContentObserverSync(mSettingsObserver); + if (Flags.registerContentObserversAsync()) { + mSecureSettings.unregisterContentObserverAsync(mSettingsObserver); + } else { + mSecureSettings.unregisterContentObserverSync(mSettingsObserver); + } } else if (!mSettingRegistered) { for (TriggerSensor s : mTriggerSensors) { s.registerSettingsObserver(mSettingsObserver); @@ -750,8 +755,13 @@ public class DozeSensors { public void registerSettingsObserver(ContentObserver settingsObserver) { if (mConfigured && !TextUtils.isEmpty(mSetting)) { - mSecureSettings.registerContentObserverForUserSync( - mSetting, mSettingsObserver, UserHandle.USER_ALL); + if (Flags.registerContentObserversAsync()) { + mSecureSettings.registerContentObserverForUserAsync( + mSetting, mSettingsObserver, UserHandle.USER_ALL); + } else { + mSecureSettings.registerContentObserverForUserSync( + mSetting, mSettingsObserver, UserHandle.USER_ALL); + } } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java index 10d07a0ce004..5052a008af68 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java @@ -35,8 +35,8 @@ import android.os.Handler; import android.os.PowerManager; import android.provider.Settings; -import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.SysuiTestCase; @@ -53,6 +53,7 @@ import com.android.systemui.tuner.TunerService; import com.android.systemui.unfold.FoldAodAnimationController; import com.android.systemui.unfold.SysUIUnfoldComponent; import com.android.systemui.util.settings.FakeSettings; +import com.android.systemui.util.settings.SecureSettings; import org.junit.Assert; import org.junit.Before; @@ -114,6 +115,7 @@ public class DozeParametersTest extends SysuiTestCase { .thenReturn(mFoldAodAnimationController); when(mUserTracker.getUserId()).thenReturn(ActivityManager.getCurrentUser()); + SecureSettings secureSettings = new FakeSettings(); mDozeParameters = new DozeParameters( mContext, mHandler, @@ -132,7 +134,7 @@ public class DozeParametersTest extends SysuiTestCase { mStatusBarStateController, mUserTracker, mDozeInteractor, - new FakeSettings() + secureSettings ); verify(mBatteryController).addCallback(mBatteryStateChangeCallback.capture()); |