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

Commit dea82a2d 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

Change-Id: I9f08cea7cef1bb317f7fe4b8913e317f3770b892
parents 023d49ad 42e5d322
Loading
Loading
Loading
Loading
+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"
        }
    }

}
+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"
        }
    }

+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)
+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)
+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)
Loading