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

Commit 42ca889a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix AppOpsStartedWatcherTest" into main

parents 49231bb9 8e5580b5

services/tests/servicestests/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ 
    <uses-permission android:name="android.permission.USE_BIOMETRIC_INTERNAL" />

    <uses-permission android:name="android.permission.MANAGE_MEDIA_PROJECTION" />

    <uses-permission android:name="android.permission.MANAGE_ROLE_HOLDERS" />

    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

    <uses-permission android:name="android.permission.CAMERA" />



    <queries>

        <package android:name="com.android.servicestests.apps.suspendtestapp" />

services/tests/servicestests/src/com/android/server/appop/AppOpsStartedWatcherTest.java

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ public class AppOpsStartedWatcherTest { 
        // Start some ops

        appOpsManager.startOp(AppOpsManager.OP_FINE_LOCATION);

        appOpsManager.startOp(AppOpsManager.OP_CAMERA);

        appOpsManager.startOp(AppOpsManager.OP_RECORD_AUDIO);



        // Verify that we got called for the ops being started

        final InOrder inOrder = inOrder(listener);