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

Commit 535616e2 authored by Julien Desprez's avatar Julien Desprez Committed by Android (Google) Code Review
Browse files

Merge "Fix test mapping conflit of class vs. package"

parents 7cd4b807 8b19677c

core/java/android/app/TEST_MAPPING

+1 −7
Original line number Diff line number Diff line
@@ -23,13 +23,7 @@ 
            "name": "FrameworksServicesTests",

            "options": [

                {

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

                },

                {

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

                },

                {

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

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

                }

            ]

        }

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

+1 −7
Original line number Diff line number Diff line
@@ -7,13 +7,7 @@ 
            "name": "FrameworksServicesTests",

            "options": [

                {

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

                },

                {

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

                },

                {

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

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

                }

            ]

        }