Merge "Remove unnecessary old code from test" into rvc-dev

This commit is contained in:
Fabian Kozynski
2020-03-30 15:01:28 +00:00
committed by Android (Google) Code Review

View File

@@ -32,7 +32,6 @@ import static org.mockito.Mockito.verify;
import static java.lang.Thread.sleep; import static java.lang.Thread.sleep;
import android.app.AppOpsManager; import android.app.AppOpsManager;
import android.content.pm.PackageManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.testing.AndroidTestingRunner; import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper; import android.testing.TestableLooper;
@@ -61,8 +60,6 @@ public class AppOpsControllerTest extends SysuiTestCase {
@Mock @Mock
private AppOpsManager mAppOpsManager; private AppOpsManager mAppOpsManager;
@Mock @Mock
private PackageManager mPackageManager;
@Mock
private AppOpsController.Callback mCallback; private AppOpsController.Callback mCallback;
@Mock @Mock
private AppOpsControllerImpl.H mMockHandler; private AppOpsControllerImpl.H mMockHandler;
@@ -79,10 +76,6 @@ public class AppOpsControllerTest extends SysuiTestCase {
getContext().addMockSystemService(AppOpsManager.class, mAppOpsManager); getContext().addMockSystemService(AppOpsManager.class, mAppOpsManager);
// All permissions of TEST_UID and TEST_UID_OTHER are user sensitive. None of
// TEST_UID_NON_USER_SENSITIVE are user sensitive.
getContext().setMockPackageManager(mPackageManager);
mController = mController =
new AppOpsControllerImpl(mContext, mTestableLooper.getLooper(), mDumpManager); new AppOpsControllerImpl(mContext, mTestableLooper.getLooper(), mDumpManager);
} }