Merge "Flag off stickiness of show/hide system setting." into tm-dev

tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java

@@ -26,15 +26,19 @@ import static org.mockito.Mockito.when;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
+import android.provider.DeviceConfig;
 import android.provider.Settings;
 
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
+import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
 import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
+import com.android.settings.testutils.shadow.ShadowDeviceConfig;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.location.RecentLocationApps;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -50,7 +54,7 @@ import java.util.List;
 import java.util.Set;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowUserManager.class})
+@Config(shadows = {ShadowDeviceConfig.class, ShadowUserManager.class})
 public class RecentLocationRequestPreferenceControllerTest {
     @Mock
     private PreferenceScreen mScreen;
@@ -72,6 +76,11 @@ public class RecentLocationRequestPreferenceControllerTest {
         mController.mRecentLocationApps = spy(new RecentLocationApps(mContext));
     }
 
+    @After
+    public void tearDown() {
+        ShadowDeviceConfig.reset();
+    }
+
     @Test
     public void updateState_whenAppListMoreThanThree_shouldDisplayTopThreeApps() {
         final List<RecentLocationApps.Request> requests = createMockRequest(6);
@@ -84,6 +93,10 @@ public class RecentLocationRequestPreferenceControllerTest {
 
     @Test
     public void updateState_whenAppListMoreThanThree_showSystem() {
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+                SystemUiDeviceConfigFlags.PROPERTY_LOCATION_INDICATORS_SMALL_ENABLED,
+                Boolean.toString(true),
+                true);
         when(mController.mRecentLocationApps.getAppListSorted(false))
                 .thenReturn(createMockRequest(2));
         when(mController.mRecentLocationApps.getAppListSorted(true))