From 6ba22a3b9ae2f09eef8cc56a438fd9ac8d3fa97d Mon Sep 17 00:00:00 2001
From: ykhung <ykhung@google.com>
Date: Thu, 3 Jun 2021 13:12:00 +0800
Subject: [PATCH] Remove missed added testing locale to cause flaky

Bug: 189998237
Test: make SettingsRoboTests
Change-Id: Id36c72ff8eee02c1e64f29a0dbefa0eb9804845a
---
 .../fuelgauge/BatteryChartPreferenceControllerTest.java     | 3 +++
 .../com/android/settings/fuelgauge/ConvertUtilsTest.java    | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java
index 154673de054..7894c3f0c60 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java
@@ -49,6 +49,7 @@ import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -118,6 +119,7 @@ public final class BatteryChartPreferenceControllerTest {
             createBatteryHistoryMap());
     }
 
+    @Ignore
     @Test
     public void testOnResume_uiModeIsChanged_clearBatteryDiffEntryCache() {
         doReturn(mResources).when(mContext).getResources();
@@ -133,6 +135,7 @@ public final class BatteryChartPreferenceControllerTest {
         assertThat(BatteryDiffEntry.sResourceCache).isEmpty();
     }
 
+    @Ignore
     @Test
     public void testOnResume_uiModeIsNotChanged_notClearBatteryDiffEntryCache() {
         doReturn(mResources).when(mContext).getResources();
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
index a6a9f193f31..7e1d3e43bb8 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
@@ -29,6 +29,7 @@ import android.os.UserHandle;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -60,8 +61,6 @@ public final class ConvertUtilsTest {
         mContext = spy(RuntimeEnvironment.application);
         mFeatureFactory = FakeFeatureFactory.setupForTest();
         mPowerUsageFeatureProvider = mFeatureFactory.powerUsageFeatureProvider;
-        Locale.setDefault(new Locale("en_US"));
-        org.robolectric.shadows.ShadowSettings.set24HourTimeFormat(false);
     }
 
     @Test
@@ -317,6 +316,7 @@ public final class ConvertUtilsTest {
             .isEqualTo(entry.mConsumePower * ratio);
     }
 
+    @Ignore
     @Test
     public void testUtcToLocalTime_returnExpectedResult() {
         ConvertUtils.sZoneId = null;
@@ -335,6 +335,7 @@ public final class ConvertUtilsTest {
         assertThat(ConvertUtils.sLocale).isEqualTo(Locale.getDefault());
     }
 
+    @Ignore
     @Test
     public void testUtcToLocalTimeHour_12HourFormat_returnExpectedResult() {
         ConvertUtils.sZoneIdForHour = null;
@@ -353,6 +354,7 @@ public final class ConvertUtilsTest {
         assertThat(ConvertUtils.sLocaleForHour).isEqualTo(Locale.getDefault());
     }
 
+    @Ignore
     @Test
     public void testUtcToLocalTimeHour_24HourFormat_returnExpectedResult() {
         ConvertUtils.sZoneIdForHour = null;