commit d96d371e80c05ad8df45d3e9726618d2311774d0
author Erik Wolsheimer <ewol@google.com> Wed Mar 24 17:45:48 2021 -0700
committer Erik Wolsheimer <ewol@google.com> Mon Mar 29 21:38:43 2021 -0700
tree 70eb24778cc6cecab0da6e00e038dd358c903d49
parent 4f373fee324d72a2f4ef178050809e361738c64b

Temporarily disable AppOpsServiceTest#testShutdown, remove unused imports

Bug: 183523911
Test: Manual
Change-Id: I96f7afd5465e58ed60b4a4ce124e85bcf7bcd494

services/tests/mockingservicestests/src/com/android/server/appop/AppOpsServiceTest.java

diff --git a/services/tests/mockingservicestests/src/com/android/server/appop/AppOpsServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/appop/AppOpsServiceTest.java
index 7a3a950..647ea13 100644
--- a/services/tests/mockingservicestests/src/com/android/server/appop/AppOpsServiceTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/appop/AppOpsServiceTest.java
@@ -16,8 +16,6 @@
 package com.android.server.appop;
 
 import static android.app.ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE;
-import static android.app.AppOpsManager.FILTER_BY_PACKAGE_NAME;
-import static android.app.AppOpsManager.FILTER_BY_UID;
 import static android.app.AppOpsManager.MODE_ALLOWED;
 import static android.app.AppOpsManager.MODE_ERRORED;
 import static android.app.AppOpsManager.MODE_FOREGROUND;
@@ -44,7 +42,6 @@
 import static org.mockito.ArgumentMatchers.nullable;
 
 import android.app.ActivityManager;
-import android.app.AppOpsManager;
 import android.app.AppOpsManager.OpEntry;
 import android.app.AppOpsManager.PackageOps;
 import android.content.ContentResolver;
@@ -53,7 +50,6 @@
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Process;
-import android.os.RemoteCallback;
 import android.provider.Settings;
 
 import androidx.test.InstrumentationRegistry;
@@ -66,6 +62,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.quality.Strictness;
@@ -73,9 +70,6 @@
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Unit tests for AppOpsService. Covers functionality that is difficult to test using CTS tests
@@ -229,6 +223,7 @@
 
     // Tests that ops are persisted during shutdown.
     @Test
+    @Ignore("b/183523911")
     public void testShutdown() {
         mAppOpsService.setMode(OP_READ_SMS, mMyUid, sMyPackageName, MODE_ALLOWED);
         mAppOpsService.noteOperation(OP_READ_SMS, mMyUid, sMyPackageName, null, false, null, false);