Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab4f103a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Re-enable AppOpsServiceTest#testShutdown" into sc-dev am: 1461322b am: 2261056b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14326717

Change-Id: Ie7c5eb2e463eb48247820d6201e441f812d733f9
parents c8490057 2261056b

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -62,7 +62,6 @@ import com.android.server.pm.parsing.pkg.AndroidPackage; 




import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.mockito.quality.Strictness;

import org.mockito.quality.Strictness;
@@ -223,7 +222,6 @@ public class AppOpsServiceTest { 




    // Tests that ops are persisted during shutdown.

    // Tests that ops are persisted during shutdown.

    @Test

    @Test

    @Ignore("b/183523911")

    public void testShutdown() {

    public void testShutdown() {

        mAppOpsService.setMode(OP_READ_SMS, mMyUid, sMyPackageName, MODE_ALLOWED);

        mAppOpsService.setMode(OP_READ_SMS, mMyUid, sMyPackageName, MODE_ALLOWED);

        mAppOpsService.noteOperation(OP_READ_SMS, mMyUid, sMyPackageName, null, false, null, false);

        mAppOpsService.noteOperation(OP_READ_SMS, mMyUid, sMyPackageName, null, false, null, false);