From 6a4ac9cdbf1cd51b4ad150aec56d1400f8c7ebef Mon Sep 17 00:00:00 2001 From: Matthew DeVore Date: Wed, 26 Feb 2025 19:07:07 +0000 Subject: [PATCH] CD updater: add missing call in tests ag/31885242 changed the behavior for registerCallback such that it no longer automatically scheduled an update. This CL adds the missing call in tests. Flag: com.android.settings.flags.display_topology_pane_in_display_list Test: atest ExternalDisplayUpdaterTest.java Test: atest ConnectedDeviceGroupControllerTest.java Bug: b/399273324 Change-Id: If030e7cc98289fe3062c1a638580ec6c6479d97a --- .../connecteddevice/ConnectedDeviceGroupControllerTest.java | 3 +-- .../connecteddevice/display/ExternalDisplayUpdaterTest.java | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java index d754993d998..327e2cae5a2 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java @@ -35,7 +35,6 @@ import android.content.Context; import android.content.pm.PackageManager; import android.content.res.Resources; import android.hardware.input.InputManager; -import android.platform.test.annotations.EnableFlags; import android.platform.test.flag.junit.SetFlagsRule; import android.util.FeatureFlagUtils; import android.view.InputDevice; @@ -54,7 +53,6 @@ import com.android.settings.connecteddevice.stylus.StylusDeviceUpdater; import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.flags.FakeFeatureFlagsImpl; -import com.android.settings.flags.Flags; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -213,6 +211,7 @@ public class ConnectedDeviceGroupControllerTest { mConnectedDeviceGroupController.onStart(); verify(mExternalDisplayUpdater).registerCallback(); + verify(mExternalDisplayUpdater).refreshPreference(); verify(mConnectedBluetoothDeviceUpdater).registerCallback(); verify(mConnectedUsbDeviceUpdater).registerCallback(); verify(mConnectedDockUpdater).registerCallback(); diff --git a/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayUpdaterTest.java b/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayUpdaterTest.java index 824974ad854..698f0a42e20 100644 --- a/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayUpdaterTest.java +++ b/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayUpdaterTest.java @@ -63,6 +63,7 @@ public class ExternalDisplayUpdaterTest extends ExternalDisplayTestBase { return null; }).when(mMockedCallback).onDeviceAdded(any()); mUpdater.initPreference(mContext, mMockedInjector); + mUpdater.refreshPreference(); mUpdater.registerCallback(); mHandler.flush(); assertThat(mPreferenceAdded).isNotNull(); @@ -85,6 +86,7 @@ public class ExternalDisplayUpdaterTest extends ExternalDisplayTestBase { return null; }).when(mMockedCallback).onDeviceRemoved(any()); mUpdater.initPreference(mContext, mMockedInjector); + mUpdater.refreshPreference(); mUpdater.registerCallback(); mHandler.flush(); assertThat(mPreferenceAdded).isNotNull();