commit 080ef457638d1a62adb8f05fc30f0bb5d2fc3963
author Siim Sammul <siims@google.com> Mon Aug 15 11:25:37 2022 +0000
committer Siim Sammul <siims@google.com> Wed Aug 17 15:25:59 2022 +0000
tree 70e1e17cd0d8d659d348818927eb42810d8eaa4f
parent d120f15a5021bc0f0b2ad3f59709ac99a1f8d8e4

Revert "Fix unit tests due to change to binder latency collectio..."

Revert "Add cts test for WifiFrameworkInitializer for binder cal..."

Revert "Initialize binder latency histograms collection via Bind..."

Revert "Initialize binder latency histograms collection via Bind..."

Revert submission 17123043-binder-latency-wifi

Reason for revert: unexpected increased memory usage
Reverted Changes:
I2cb0f7b69:Initialize binder latency histograms collection vi...
Id12e3a515:Fix unit tests due to change to binder latency col...
I26dbd757b:Add cts test for WifiFrameworkInitializer for bind...
I0d76cbcb3:Initialize binder latency histograms collection vi...

Change-Id: I0145bb5dc30b710d4076fd2b9cedd10aeaf3bf97

tests/carservice_unit_test/src/com/android/car/hardware/power/CarPowerManagerUnitTest.java

diff --git a/tests/carservice_unit_test/src/com/android/car/hardware/power/CarPowerManagerUnitTest.java b/tests/carservice_unit_test/src/com/android/car/hardware/power/CarPowerManagerUnitTest.java
index 8fb91f7..ebe126f 100644
--- a/tests/carservice_unit_test/src/com/android/car/hardware/power/CarPowerManagerUnitTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/hardware/power/CarPowerManagerUnitTest.java
@@ -39,7 +39,6 @@
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.junit.Assert.assertThrows;
-import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 
@@ -51,15 +50,12 @@
 import android.car.hardware.power.PowerComponent;
 import android.car.test.mocks.AbstractExtendedMockitoTestCase;
 import android.car.test.mocks.JavaMockitoHelper;
-import android.content.ContentResolver;
 import android.content.Context;
-import android.content.IContentProvider;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.frameworks.automotive.powerpolicy.internal.ICarPowerPolicySystemNotification;
 import android.hardware.automotive.vehicle.VehicleApPowerStateReq;
 import android.hardware.automotive.vehicle.VehicleApPowerStateShutdownParam;
-import android.net.wifi.WifiManager;
 import android.os.UserManager;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.AtomicFile;
@@ -83,7 +79,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
@@ -130,12 +125,6 @@
     private CarUserService mCarUserService;
     @Mock
     private ICarPowerPolicySystemNotification mPowerPolicyDaemon;
-    @Mock
-    private IContentProvider mIContentProvider;
-    @Mock
-    private ContentResolver mContentResolver;
-    @Mock
-    private WifiManager mWifiManager;
 
     public CarPowerManagerUnitTest() throws Exception {
         super(CarPowerManager.TAG);
@@ -432,11 +421,6 @@
                 + mResources.getInteger(R.integer.maxGarageModeRunningDurationInSecs));
         mPowerComponentHandler = new PowerComponentHandler(mContext, mSystemInterface,
                 new AtomicFile(mComponentStateFile.getFile()));
-
-        when(mContext.getContentResolver()).thenReturn(mContentResolver);
-        when(mContentResolver.acquireProvider(anyString())).thenReturn(mIContentProvider);
-        when(mContext.getSystemService(ArgumentMatchers.<Class>any())).thenReturn(mWifiManager);
-
         mService = new CarPowerManagementService(mContext, mResources, mPowerHal, mSystemInterface,
                 mUserManager, mCarUserService, mPowerPolicyDaemon, mPowerComponentHandler,
                 /* silentModeHwStatePath= */ null, /* silentModeKernelStatePath= */ null,