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

Commit ca946bed authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

DO NOT MERGE Fix AppOpsServiceTest am: c03b32c4 am: 47cc8487 

Change-Id: Iccb7dc7d5857c2fbd03372cc0f97cfd429ece85f
parents cb5b9589 47cc8487

services/core/java/com/android/server/appop/TEST_MAPPING

+8 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,14 @@ 
                    "include-filter": "com.android.server.appop"

                    "include-filter": "com.android.server.appop"

                }

                }

            ]

            ]

        },

        {

            "name": "FrameworksMockingServicesTests",

            "options": [

                {

                    "include-filter": "com.android.server.appop"

                }

            ]

        }

        }

    ]

    ]

}
 
}

services/tests/mockingservicestests/AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />

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

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

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

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

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

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





    <application android:testOnly="true"

    <application android:testOnly="true"

                 android:debuggable="true">

                 android:debuggable="true">

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

+105 −62

File changed and moved.

Preview size limit exceeded, changes collapsed.