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

Commit 2f336d34 authored by George Chang's avatar George Chang Committed by Automerger Merge Worker
Browse files

Merge changes from topic "nfcc_aon_listener" am: 2195e2b5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669508

Change-Id: I451ca24cbfecd944ccda61bcb23df26f3c349642
parents 9aa1fc83 2195e2b5
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
{
  "presubmit": [
    {
      "name": "NfcManagerTests"
    }
  ]
}
+38 −0
Original line number Diff line number Diff line
// Copyright 2021 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.

package {
    // See: http://go/android-license-faq
    // A large-scale-change added 'default_applicable_licenses' to import
    // all of the 'license_kinds' from "frameworks_base_license"
    // to get the below license kinds:
    //   SPDX-license-identifier-Apache-2.0
    default_applicable_licenses: ["frameworks_base_license"],
}

android_test {
    name: "NfcManagerTests",
    static_libs: [
        "androidx.test.ext.junit",
        "androidx.test.rules",
        "mockito-target-minus-junit4",
    ],
    libs: [
        "android.test.runner",
    ],
    srcs: ["src/**/*.java"],
    platform_apis: true,
    certificate: "platform",
    test_suites: ["device-tests"],
}
+31 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2021 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="android.nfc">

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

    <!-- This is a self-instrumenting test package. -->
    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
                     android:targetPackage="android.nfc"
                     android:label="NFC Manager Tests">
    </instrumentation>

</manifest>
+32 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2021 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="Config for NFC Manager test cases">
    <option name="test-suite-tag" value="apct"/>
    <option name="test-suite-tag" value="apct-instrumentation"/>
    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
        <option name="cleanup-apks" value="true" />
        <option name="test-file-name" value="NfcManagerTests.apk" />
    </target_preparer>

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

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
        <option name="package" value="android.nfc" />
        <option name="hidden-api-checks" value="false"/>
        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/>
    </test>
</configuration>
+1 −0
Original line number Diff line number Diff line
include /core/java/android/nfc/OWNERS
Loading