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

Commit 0ad7cbab authored by Alexander Dorokhine's avatar Alexander Dorokhine Committed by Android (Google) Code Review
Browse files

Merge "Move TestableDeviceConfig to modules-utils."

parents 3f79d962 0ba15f15

services/tests/mockingservicestests/Android.bp

+4 −3
Original line number Diff line number Diff line
@@ -29,7 +29,10 @@ package { 


android_test {

    name: "FrameworksMockingServicesTests",

    defaults: ["FrameworkMockingServicesTests-jni-defaults"],

    defaults: [

        "FrameworkMockingServicesTests-jni-defaults",

        "modules-utils-testable-device-config-defaults",

    ],



    srcs: [

        "src/**/*.java",
@@ -67,9 +70,7 @@ android_test { 
    ],



    jni_libs: [

        "libdexmakerjvmtiagent",

        "libpsi",

        "libstaticjvmtiagent",

    ],



    certificate: "platform",

services/tests/mockingservicestests/src/com/android/server/am/CacheOomRankerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -38,10 +38,10 @@ import android.provider.DeviceConfig; 


import androidx.test.platform.app.InstrumentationRegistry;



import com.android.modules.utils.testing.TestableDeviceConfig;

import com.android.server.LocalServices;

import com.android.server.ServiceThread;

import com.android.server.appop.AppOpsService;

import com.android.server.testables.TestableDeviceConfig;

import com.android.server.wm.ActivityTaskManagerService;



import org.junit.Before;

services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -40,10 +40,10 @@ import android.text.TextUtils; 


import androidx.test.platform.app.InstrumentationRegistry;



import com.android.modules.utils.testing.TestableDeviceConfig;

import com.android.server.LocalServices;

import com.android.server.ServiceThread;

import com.android.server.appop.AppOpsService;

import com.android.server.testables.TestableDeviceConfig;

import com.android.server.wm.ActivityTaskManagerService;



import org.junit.After;

services/tests/mockingservicestests/src/com/android/server/blob/BlobStoreConfigTest.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import androidx.test.InstrumentationRegistry; 
import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.server.testables.TestableDeviceConfig;

import com.android.modules.utils.testing.TestableDeviceConfig;



import org.junit.Before;

import org.junit.Rule;

services/tests/mockingservicestests/src/com/android/server/compat/overrides/AppCompatOverridesServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ import androidx.test.filters.SmallTest; 
import com.android.internal.compat.CompatibilityOverrideConfig;

import com.android.internal.compat.CompatibilityOverridesToRemoveConfig;

import com.android.internal.compat.IPlatformCompat;

import com.android.server.testables.TestableDeviceConfig.TestableDeviceConfigRule;

import com.android.modules.utils.testing.TestableDeviceConfig.TestableDeviceConfigRule;



import org.junit.Before;

import org.junit.Rule;