Merge "Temporarily disable AppOpsServiceTest#testShutdown, remove unused imports" into sc-dev

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;

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;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.Process;

import android.os.RemoteCallback;

import android.provider.Settings;

import androidx.test.InstrumentationRegistry;

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;

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

    // 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);