From 66e146706d0c4c28b43b80771cbc4736e80dbc08 Mon Sep 17 00:00:00 2001 From: Kuan Wang Date: Thu, 14 Jul 2022 12:11:03 +0800 Subject: [PATCH] Use Mockito 4.6.1 API for BatteryChartPreferenceControllerV2Test Fix the build breakage. Bug: 238962112 Test: make RunSettingsRoboTests Change-Id: Ib85c8dc8e68b1f622dbd37dca5e79484f7cac47f --- .../batteryusage/BatteryChartPreferenceControllerV2Test.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerV2Test.java index e9d62680a0a..f4953b935e0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerV2Test.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerV2Test.java @@ -18,8 +18,8 @@ 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.any; +import static org.mockito.Mockito.anyLong; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy;