msm8953-common: Add fingerprint navigation support
* Imported from berkeley-dev's kirin970-common tree, and edited. * Opt to not use Moto's OneNav solution and instead just listen for keycodes without a middleman listener. * This likely means we can't support the on-button-release events they do (keycode 615 for example). * Add Needed sepolicy Change-Id: I4ca3ac00719aca0cd4521ae3191bf59b641546a4 Signed-off-by: Erfan Abdi <erfangplus@gmail.com> Signed-off-by: Nolen Johnson <johnsonnolen@gmail.com> msm8953-common: Convert java KeyDisabler to Touch HAL Change-Id: I19d4736a01604b354e43029ea77e54b698517954 msm8953-common: Remove libhwbinder/libhidltransport deps Since these were combined into libhidlbase. Bug: 135686713 Test: build only (libhwbinder/libhidltransport are empty) Change-Id: I640a3f0e0839214523627bf0b59fd5ae9dd2c61c
This commit is contained in:
4
interfaces/Android.bp
Normal file
4
interfaces/Android.bp
Normal file
@@ -0,0 +1,4 @@
|
||||
hidl_package_root {
|
||||
name: "com.fingerprints",
|
||||
path: "device/motorola/msm8953-common/interfaces",
|
||||
}
|
||||
11
interfaces/extension/1.0/Android.bp
Normal file
11
interfaces/extension/1.0/Android.bp
Normal file
@@ -0,0 +1,11 @@
|
||||
hidl_interface {
|
||||
name: "com.fingerprints.extension@1.0",
|
||||
root: "com.fingerprints",
|
||||
srcs: [
|
||||
"IFingerprintNavigation.hal",
|
||||
],
|
||||
interfaces: [
|
||||
"android.hidl.base@1.0",
|
||||
],
|
||||
gen_java: false,
|
||||
}
|
||||
6
interfaces/extension/1.0/IFingerprintNavigation.hal
Normal file
6
interfaces/extension/1.0/IFingerprintNavigation.hal
Normal file
@@ -0,0 +1,6 @@
|
||||
package com.fingerprints.extension@1.0;
|
||||
|
||||
interface IFingerprintNavigation {
|
||||
setNavigation(bool enabled);
|
||||
isEnabled() generates (bool isEnabled);
|
||||
};
|
||||
@@ -17,10 +17,6 @@
|
||||
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
|
||||
<!-- Whether a software navigation bar should be shown. NOTE: in the future this may be
|
||||
autodetected from the Configuration. -->
|
||||
<bool name="config_showNavigationBar">true</bool>
|
||||
|
||||
<!-- Whether device can force navbar disabling -->
|
||||
<bool name="config_canForceDisableNavigationBar">true</bool>
|
||||
|
||||
@@ -31,15 +27,6 @@
|
||||
on the headphone/microphone jack. When false use the older uevent framework. -->
|
||||
<bool name="config_useDevInputEventForAudioJack">true</bool>
|
||||
|
||||
<!-- Paths to the libraries that contain device specific key handlers -->
|
||||
<string-array name="config_deviceKeyHandlerLibs" translatable="false">
|
||||
<item>/system/priv-app/MotoActions/MotoActions.apk</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="config_deviceKeyHandlerClasses" translatable="false">
|
||||
<item>com.moto.actions.KeyHandler</item>
|
||||
</string-array>
|
||||
|
||||
<!-- Default LED on time for notification LED in milliseconds. -->
|
||||
<integer name="config_defaultNotificationLedOn">125</integer>
|
||||
|
||||
|
||||
1
sepolicy/vendor/file_contexts
vendored
1
sepolicy/vendor/file_contexts
vendored
@@ -46,6 +46,7 @@
|
||||
/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-fpcservice u:object_r:hal_fingerprint_fpc_exec:s0
|
||||
/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service-ets u:object_r:hal_fingerprint_fpc_exec:s0
|
||||
/(vendor|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service\.msm8953 u:object_r:hal_light_default_exec:s0
|
||||
/(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service\.msm8953 u:object_r:hal_lineage_touch_default_exec:s0
|
||||
/(vendor|system/vendor)/bin/hw/vendor\.dolby\.hardware\.dms@1\.0-service u:object_r:hal_dms_default_exec:s0
|
||||
/(vendor|system/vendor)/bin/init\.mmi\.(laser|usb)\.sh u:object_r:qti_init_shell_exec:s0
|
||||
/(vendor|system/vendor)/bin/init\.qcom\.power\.sh u:object_r:qti_init_shell_exec:s0
|
||||
|
||||
5
sepolicy/vendor/hal_lineage_touch_default.te
vendored
Normal file
5
sepolicy/vendor/hal_lineage_touch_default.te
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
# Allow binder communication with hal_fingerprint
|
||||
binder_call(hal_lineage_touch_default, hal_fingerprint)
|
||||
|
||||
# Allow hal_lineage_touch_default to find fpc_extension_service
|
||||
allow hal_lineage_touch_default fpc_extension_service:hwservice_manager find;
|
||||
32
touch/Android.bp
Normal file
32
touch/Android.bp
Normal file
@@ -0,0 +1,32 @@
|
||||
// Copyright (C) 2019 The LineageOS 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_binary {
|
||||
name: "vendor.lineage.touch@1.0-service.msm8953",
|
||||
init_rc: ["vendor.lineage.touch@1.0-service.msm8953.rc"],
|
||||
defaults: ["hidl_defaults"],
|
||||
relative_install_path: "hw",
|
||||
vendor: true,
|
||||
srcs: [
|
||||
"KeyDisabler.cpp",
|
||||
"service.cpp"
|
||||
],
|
||||
shared_libs: [
|
||||
"libbase",
|
||||
"libhidlbase",
|
||||
"libutils",
|
||||
"com.fingerprints.extension@1.0",
|
||||
"vendor.lineage.touch@1.0",
|
||||
],
|
||||
}
|
||||
55
touch/KeyDisabler.cpp
Normal file
55
touch/KeyDisabler.cpp
Normal file
@@ -0,0 +1,55 @@
|
||||
/*
|
||||
* Copyright (C) 2019 The LineageOS 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 <android-base/file.h>
|
||||
#include <android-base/logging.h>
|
||||
#include <android-base/strings.h>
|
||||
|
||||
#include "KeyDisabler.h"
|
||||
|
||||
namespace vendor {
|
||||
namespace lineage {
|
||||
namespace touch {
|
||||
namespace V1_0 {
|
||||
namespace implementation {
|
||||
|
||||
KeyDisabler::KeyDisabler() {
|
||||
mHasKeyDisabler = false;
|
||||
|
||||
mFingerprintNavigation = IFingerprintNavigation::getService();
|
||||
if (mFingerprintNavigation != nullptr)
|
||||
mHasKeyDisabler = true;
|
||||
}
|
||||
|
||||
// Methods from ::vendor::lineage::touch::V1_0::IKeyDisabler follow.
|
||||
Return<bool> KeyDisabler::isEnabled() {
|
||||
if (!mHasKeyDisabler) return false;
|
||||
|
||||
return mFingerprintNavigation->isEnabled();
|
||||
}
|
||||
|
||||
Return<bool> KeyDisabler::setEnabled(bool enabled) {
|
||||
if (!mHasKeyDisabler) return false;
|
||||
|
||||
mFingerprintNavigation->setNavigation(!enabled);
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace implementation
|
||||
} // namespace V1_0
|
||||
} // namespace touch
|
||||
} // namespace lineage
|
||||
} // namespace vendor
|
||||
52
touch/KeyDisabler.h
Normal file
52
touch/KeyDisabler.h
Normal file
@@ -0,0 +1,52 @@
|
||||
/*
|
||||
* Copyright (C) 2019 The LineageOS 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.
|
||||
*/
|
||||
|
||||
#ifndef VENDOR_LINEAGE_TOUCH_V1_0_KEYDISABLER_H
|
||||
#define VENDOR_LINEAGE_TOUCH_V1_0_KEYDISABLER_H
|
||||
|
||||
#include <com/fingerprints/extension/1.0/IFingerprintNavigation.h>
|
||||
#include <vendor/lineage/touch/1.0/IKeyDisabler.h>
|
||||
|
||||
namespace vendor {
|
||||
namespace lineage {
|
||||
namespace touch {
|
||||
namespace V1_0 {
|
||||
namespace implementation {
|
||||
|
||||
using ::android::hardware::Return;
|
||||
using ::android::sp;
|
||||
using ::com::fingerprints::extension::V1_0::IFingerprintNavigation;
|
||||
|
||||
class KeyDisabler : public IKeyDisabler {
|
||||
public:
|
||||
KeyDisabler();
|
||||
|
||||
// Methods from ::vendor::lineage::touch::V1_0::IKeyDisabler follow.
|
||||
Return<bool> isEnabled() override;
|
||||
Return<bool> setEnabled(bool enabled) override;
|
||||
|
||||
private:
|
||||
bool mHasKeyDisabler;
|
||||
sp<IFingerprintNavigation> mFingerprintNavigation;
|
||||
};
|
||||
|
||||
} // namespace implementation
|
||||
} // namespace V1_0
|
||||
} // namespace touch
|
||||
} // namespace lineage
|
||||
} // namespace vendor
|
||||
|
||||
#endif // VENDOR_LINEAGE_TOUCH_V1_0_KEYDISABLER_H
|
||||
62
touch/service.cpp
Normal file
62
touch/service.cpp
Normal file
@@ -0,0 +1,62 @@
|
||||
/*
|
||||
* Copyright (C) 2019 The LineageOS 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.
|
||||
*/
|
||||
|
||||
#define LOG_TAG "vendor.lineage.touch@1.0-service.msm8953"
|
||||
|
||||
#include <android-base/logging.h>
|
||||
#include <hidl/HidlTransportSupport.h>
|
||||
|
||||
#include "KeyDisabler.h"
|
||||
|
||||
using android::OK;
|
||||
using android::sp;
|
||||
using android::status_t;
|
||||
using android::hardware::configureRpcThreadpool;
|
||||
using android::hardware::joinRpcThreadpool;
|
||||
|
||||
using ::vendor::lineage::touch::V1_0::IKeyDisabler;
|
||||
using ::vendor::lineage::touch::V1_0::implementation::KeyDisabler;
|
||||
|
||||
int main() {
|
||||
sp<KeyDisabler> keyDisabler;
|
||||
status_t status;
|
||||
|
||||
LOG(INFO) << "Touch HAL service is starting.";
|
||||
|
||||
keyDisabler = new KeyDisabler();
|
||||
if (keyDisabler == nullptr) {
|
||||
LOG(ERROR) << "Can not create an instance of Touch HAL KeyDisabler Iface, exiting.";
|
||||
goto shutdown;
|
||||
}
|
||||
|
||||
configureRpcThreadpool(1, true /*callerWillJoin*/);
|
||||
|
||||
status = keyDisabler->registerAsService();
|
||||
if (status != OK) {
|
||||
LOG(ERROR) << "Could not register service for Touch HAL KeyDisabler Iface ("
|
||||
<< status << ")";
|
||||
goto shutdown;
|
||||
}
|
||||
|
||||
LOG(INFO) << "Touch HAL service is ready.";
|
||||
joinRpcThreadpool();
|
||||
// Should not pass this line
|
||||
|
||||
shutdown:
|
||||
// In normal operation, we don't expect the thread pool to shutdown
|
||||
LOG(ERROR) << "Touch HAL service is shutting down.";
|
||||
return 1;
|
||||
}
|
||||
4
touch/vendor.lineage.touch@1.0-service.msm8953.rc
Normal file
4
touch/vendor.lineage.touch@1.0-service.msm8953.rc
Normal file
@@ -0,0 +1,4 @@
|
||||
service vendor.touch-hal-1-0-msm8953 /vendor/bin/hw/vendor.lineage.touch@1.0-service.msm8953
|
||||
class hal
|
||||
user system
|
||||
group system
|
||||
Reference in New Issue
Block a user