Merge "Revert sensors multihal 2.0 changes temporarily."

//

// Copyright (C) 2019 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.

cc_defaults {

    name: "android.hardware.sensors@2.0-multihal-defaults",

    header_libs: [

        "android.hardware.sensors@2.0-multihal.header",

    ],

    shared_libs: [

        "android.hardware.sensors@1.0",

        "android.hardware.sensors@2.0",

        "libbase",

        "libcutils",

        "libfmq",

        "libhidlbase",

        "liblog",

        "libpower",

        "libutils",

    ],

    cflags: ["-DLOG_TAG=\"SensorsMultiHal\""],

}

cc_binary {

    name: "android.hardware.sensors@2.0-service.multihal",

    defaults: [

        "hidl_defaults",

        "android.hardware.sensors@2.0-multihal-defaults",

    ],

    vendor: true,

    relative_install_path: "hw",

    srcs: [

        "service.cpp",

        "HalProxy.cpp",

        "ScopedWakelock.cpp",

    ],

    init_rc: ["android.hardware.sensors@2.0-service-multihal.rc"],

    vintf_fragments: ["android.hardware.sensors@2.0-multihal.xml"],

}

cc_library_headers {

    name: "android.hardware.sensors@2.0-multihal.header",

    vendor_available: true,

    export_include_dirs: ["include"],

}

// The below targets should only be used for testing.

cc_test_library {

    name: "android.hardware.sensors@2.0-HalProxy",

    defaults: ["android.hardware.sensors@2.0-multihal-defaults"],

    vendor_available: true,

    srcs: [

        "HalProxy.cpp",

        "ScopedWakelock.cpp",

    ],

    export_header_lib_headers: [

        "android.hardware.sensors@2.0-multihal.header",

    ],

    shared_libs: [

        "libutils",

    ],

}

arthuri@google.com

bduddie@google.com

stange@google.com

 No newline at end of file

/*

 * Copyright (C) 2019 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.

 */

#include "ScopedWakelock.h"

namespace android {

namespace hardware {

namespace sensors {

namespace V2_0 {

namespace implementation {

int64_t getTimeNow() {

    return std::chrono::duration_cast<std::chrono::nanoseconds>(

                   std::chrono::system_clock::now().time_since_epoch())

            .count();

}

ScopedWakelock::ScopedWakelock(IScopedWakelockRefCounter* refCounter, bool locked)

    : mRefCounter(refCounter), mLocked(locked) {

    if (mLocked) {

        mLocked = mRefCounter->incrementRefCountAndMaybeAcquireWakelock(1, &mCreatedAtTimeNs);

    }

}

ScopedWakelock::~ScopedWakelock() {

    if (mLocked) {

        mRefCounter->decrementRefCountAndMaybeReleaseWakelock(1, mCreatedAtTimeNs);

    }

}

}  // namespace implementation

}  // namespace V2_0

}  // namespace sensors

}  // namespace hardware

}  // namespace android

 No newline at end of file

<manifest version="1.0" type="device">

    <hal format="hidl">

        <name>android.hardware.sensors</name>

        <transport>hwbinder</transport>

        <version>2.0</version>

        <interface>

            <name>ISensors</name>

            <instance>multihal</instance>

        </interface>

    </hal>

</manifest>