Merge "Small test changes"

    },

    {

      "name": "CtsLocationNoneTestCases"

    },

    {

      "name": "FrameworksMockingServicesTests",

      "options": [{

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

      }]

    }

  ]

}

 No newline at end of file

android_test {

    name: "FrameworksLocationTests",

    // Include all test java files.

    srcs: ["src/**/*.java"],

    libs: [

        "android.test.runner",

        "android.test.base",

    ],

    platform_apis: true,

    static_libs: [

        "androidx.test.rules",

        "core-test-rules",

        "guava",

        "mockito-target-minus-junit4",

        "frameworks-base-testutils",

        "truth-prebuilt",

    ],

    test_suites: ["device-tests"],

}

<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.frameworks.locationtests">

    <!-- location test permissions -->

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

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

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

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

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

    <application>

        <uses-library android:name="android.test.runner" />

    </application>

    <instrumentation

        android:name="androidx.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.android.frameworks.locationtests"

        android:label="Frameworks Location Tests" />

</manifest>

<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2017 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Runs Frameworks Location API Tests.">

    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

        <option name="test-file-name" value="FrameworksLocationTests.apk" />

    </target_preparer>

    <option name="test-suite-tag" value="apct" />

    <option name="test-tag" value="FrameworksLocationTests" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.frameworks.locationtests" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="hidden-api-checks" value="false"/>

    </test>

</configuration>