Merge "[Ravenwood] Remove usage of RavenwoodConfig" into main (fb3baa77) · Commits · e / os / android_frameworks_base

services/tests/powerstatstests/src/com/android/server/power/stats/BatteryExternalStatsWorkerTest.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import android.hardware.power.stats.StateResidencyResult;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.connectivity.WifiActivityEnergyInfo;
		import android.platform.test.ravenwood.RavenwoodConfig;
		import android.power.PowerStatsInternal;
		import android.util.IntArray;
		import android.util.SparseArray;
		@@ -66,9 +65,6 @@ import java.util.concurrent.CompletableFuture;
		@SuppressWarnings("GuardedBy")
		@android.platform.test.annotations.DisabledOnRavenwood
		public class BatteryExternalStatsWorkerTest {
		@RavenwoodConfig.Config
		public final RavenwoodConfig mRavenwood = new RavenwoodConfig.Builder().build();

		private BatteryExternalStatsWorker mBatteryExternalStatsWorker;
		private TestPowerStatsInternal mPowerStatsInternal;
		private Handler mHandler;

+0 −6

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import static org.mockito.Mockito.mock;
		import android.os.BatteryConsumer;
		import android.os.PersistableBundle;
		import android.os.Process;
		import android.platform.test.ravenwood.RavenwoodConfig;

		import com.android.internal.os.BatteryStatsHistory;
		import com.android.internal.os.MonotonicClock;
		@@ -48,11 +47,6 @@ import org.junit.Rule;
		import org.junit.Test;

		public class WakelockPowerStatsProcessorTest {
		@RavenwoodConfig.Config
		public static final RavenwoodConfig sConfig = new RavenwoodConfig.Builder()
		.setProvideMainThread(true)
		.build();

		@Rule
		public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule()
		.setAveragePower(PowerProfile.POWER_CPU_IDLE, 720);