From 2e7957727f09e6f0b563e11b7a96cd90a8dc9cd8 Mon Sep 17 00:00:00 2001 From: Zaiyue Xue Date: Wed, 10 Aug 2022 18:26:55 +0800 Subject: [PATCH] Fix import of anyLong in BatteryChartPreferenceControllerTest. This is to fix the merge conflicts within tm-qpr-dev, tm-qpr-dev-plus-aosp and master. Bug: 236101166 Test: manual Change-Id: I2f4531ccc7c59b279d14bc5c0bd6c1fe51dd475d Merged-In: I52547d10f0579fddb21091b641925910db17ef38 --- .../batteryusage/BatteryChartPreferenceControllerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java index 75b7fe143e9..ec982264e60 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.fuelgauge.batteryusage; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.anyLong; +import static org.mockito.Mockito.anyLong; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy;