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

Commit b6804a1d authored by Stanislav Zholnin's avatar Stanislav Zholnin
Browse files

resolve merge conflicts of 4603f2ac to master 

Change-Id: I215aa52b3f5d1762742e65426e08b3bb71464397
parents ebed9913 4603f2ac

core/java/android/app/TEST_MAPPING

+6 −1
Original line number Diff line number Diff line
@@ -24,7 +24,12 @@ 
        },

        {

            "file_patterns": ["(/|^)AppOpsManager.java"],

            "name": "UidAtomTests:testAppOps"

            "name": "CtsStatsdHostTestCases",

            "options": [

                {

                    "include-filter": "android.cts.statsd.atom.UidAtomTests"

                }

            ]

        },

        {

            "file_patterns": ["(/|^)AppOpsManager.java"],

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

+6 −1
Original line number Diff line number Diff line
@@ -48,7 +48,12 @@ 
            ]

        },

        {

            "name": "UidAtomTests:testAppOps"

            "name": "CtsStatsdHostTestCases",

            "options": [

                {

                    "include-filter": "android.cts.statsd.atom.UidAtomTests"

                }

            ]

        }

    ]

}