Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96d03551 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Ravenwood] Remove usage of RavenwoodFlagsValueProvider" into aosp-main-future

parents d734b42c 9a5c0bda

core/tests/coretests/src/android/content/res/FontScaleConverterFactoryTest.kt

+1 −12
Original line number Diff line number Diff line
@@ -18,10 +18,7 @@ package android.content.res 


import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresFlagsEnabled

import android.platform.test.flag.junit.CheckFlagsRule

import android.platform.test.flag.junit.DeviceFlagsValueProvider

import android.platform.test.flag.junit.RavenwoodFlagsValueProvider

import android.platform.test.ravenwood.RavenwoodRule

import android.util.SparseArray

import androidx.core.util.forEach

import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -47,15 +44,7 @@ import org.junit.runner.RunWith 
class FontScaleConverterFactoryTest {



    @get:Rule

    val ravenwoodRule: RavenwoodRule = RavenwoodRule.Builder().build()



    @get:Rule

    val checkFlagsRule: CheckFlagsRule =

        if (RavenwoodRule.isOnRavenwood()) {

            RavenwoodFlagsValueProvider.createAllOnCheckFlagsRule()

        } else {

            DeviceFlagsValueProvider.createCheckFlagsRule()

        }

    val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()



    private var defaultLookupTables: SparseArray<FontScaleConverter>? = null

core/tests/coretests/src/android/content/res/ResourcesManagerTest.java

+1 −9
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ import android.platform.test.annotations.Postsubmit; 
import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.platform.test.flag.junit.RavenwoodFlagsValueProvider;

import android.platform.test.ravenwood.RavenwoodRule;

import android.util.ArraySet;

import android.util.DisplayMetrics;

import android.util.TypedValue;
@@ -65,13 +63,7 @@ public class ResourcesManagerTest { 
    private static final String TEST_LIB = "com.android.frameworks.coretests.bdr_helper_app1";



    @Rule

    public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder().build();



    @Rule

    public final CheckFlagsRule mCheckFlagsRule =

            RavenwoodRule.isOnRavenwood()

                    ? RavenwoodFlagsValueProvider.createAllOnCheckFlagsRule()

                    : DeviceFlagsValueProvider.createCheckFlagsRule();

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();



    private ResourcesManager mResourcesManager;

    private Map<Integer, DisplayMetrics> mDisplayMetricsMap;