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

Commit 05024a15 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Hai Zhang
Browse files

DO NOT MERGE Fix AppOpsServiceTest

- Mock LocalService dependency
- Always assume calling app has appropriate permissions

Test: atest atest FrameworksMockingServicesTests:com.android.server.appop
Fixes: 132274015
Fixes: 147778434
Bug: 146463528
Bug: 146590200
Merged-In: Ie816e0c6c81ecf25d37f05187591ca0d1edf0bc2
Change-Id: Ie816e0c6c81ecf25d37f05187591ca0d1edf0bc2
parent c1b47d49
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -10,6 +10,14 @@
                    "include-filter": "com.android.server.appop"
                }
            ]
        },
        {
            "name": "FrameworksMockingServicesTests",
            "options": [
                {
                    "include-filter": "com.android.server.appop"
                }
            ]
        }
    ]
}
+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@
    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
    <uses-permission android:name="android.permission.HARDWARE_TEST"/>
    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />

    <application android:testOnly="true"
                 android:debuggable="true">
+105 −62

File changed and moved.

Preview size limit exceeded, changes collapsed.