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

Commit 6aae3d2d authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Adding all nfc vts related things back." am: 42e5d322 am: dea82a2d 

am: b4b7d62c

Change-Id: Ib4973a85bd0ae73cb9d2512ab9e210ca919305f2
parents 28fcf1a3 b4b7d62c

nfc/1.0/vts/Nfc.vts

+24 −0
Original line number Diff line number Diff line
@@ -87,6 +87,13 @@ interface: { 
            next: "powerCycle"

            next: "controlGranted"

        }

        callflow: {

            next: "write"

            next: "close"

            next: "coreInitialized"

            next: "powerCycle"

            next: "controlGranted"

        }

    }



    api: {
@@ -98,6 +105,9 @@ interface: { 
        callflow: {

            exit: true

        }

        callflow: {

            exit: true

        }

    }



    api: {
@@ -113,6 +123,13 @@ interface: { 
            next: "coreInitialized"

            next: "powerCycle"

        }

        callflow: {

            next: "write"

            next: "close"

            next: "prediscover"

            next: "coreInitialized"

            next: "powerCycle"

        }

    }



    api: {
@@ -128,6 +145,13 @@ interface: { 
            next: "controlGranted"

            next: "close"

        }

        callflow: {

            next: "write"

            next: "coreInitialized"

            next: "prediscover"

            next: "controlGranted"

            next: "close"

        }

    }



}

nfc/1.0/vts/NfcClientCallback.vts

+2 −2
Original line number Diff line number Diff line
@@ -11,11 +11,11 @@ interface: { 
        name: "sendEvent"

        arg: {

            type: TYPE_ENUM

            predefined_type: "NfcEvent"

            predefined_type: "::android::hardware::nfc::V1_0::NfcEvent"

        }

        arg: {

            type: TYPE_ENUM

            predefined_type: "NfcStatus"

            predefined_type: "::android::hardware::nfc::V1_0::NfcStatus"

        }

    }

nfc/1.0/vts/functional/Android.mk

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2016 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.

#



LOCAL_PATH := $(call my-dir)



include $(call all-subdir-makefiles)

nfc/1.0/vts/functional/vts/Android.mk

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2016 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.

#



LOCAL_PATH := $(call my-dir)



include $(call all-subdir-makefiles)

nfc/1.0/vts/functional/vts/testcases/Android.mk

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2016 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.

#



LOCAL_PATH := $(call my-dir)



include $(call all-subdir-makefiles)