From 7a6bd1e4a4d78ea97bf78d219d71a5f576532a63 Mon Sep 17 00:00:00 2001
From: ykhung <ykhung@google.com>
Date: Tue, 1 Jun 2021 14:53:47 +0800
Subject: [PATCH] Set default locale in the testing environment to avoid flaky
 test

from the error message, looks like some testing environment cannot get the default locale settings to cause it crash. we will et the default locale before testing to avoid such condition.

Bug: 188947451
Test: make SettingsgRoboTests
Change-Id: I6ec9abba41d72c205426df8710eae5b83a841f46
---
 .../fuelgauge/BatteryChartPreferenceControllerTest.java        | 3 ++-
 .../src/com/android/settings/fuelgauge/ConvertUtilsTest.java   | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java
index 606dc194239..154673de054 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java
@@ -93,8 +93,9 @@ public final class BatteryChartPreferenceControllerTest {
 
     @Before
     public void setUp() {
-        org.robolectric.shadows.ShadowSettings.set24HourTimeFormat(false);
         MockitoAnnotations.initMocks(this);
+        Locale.setDefault(new Locale("en_US"));
+        org.robolectric.shadows.ShadowSettings.set24HourTimeFormat(false);
         mFeatureFactory = FakeFeatureFactory.setupForTest();
         mMetricsFeatureProvider = mFeatureFactory.metricsFeatureProvider;
         mContext = spy(RuntimeEnvironment.application);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
index 0c96b8eb970..a6a9f193f31 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
@@ -60,6 +60,8 @@ 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