BOBtheBlinker/android_device_oneplus_dre
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sdm845-common: Switch to common Trust HAL implementation

Browse source 
* OnePlus's OTG switch sysfs doesn't act the same as
  'deny_new_usb' node breaking OTG entirely in some
  situations.

Change-Id: I4f67d5cec5ded72ee835bfed9d34407eba1612d1
This commit is contained in:
LuK1337 2019-06-18 02:26:16 +02:00
parent 702507f7c0
commit 031d6ba43a
11 changed files with 7 additions and 227 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common.mk
View file

@ -134,7 +134,7 @@ PRODUCT_PACKAGES += \
# Trust HAL # Trust HAL
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
lineage.trust@1.0-service.oneplus_sdm845 lineage.trust@1.0-service
# Update engine # Update engine
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

1
sepolicy/private/file.te
View file

@ -14,7 +14,6 @@ type sysfs_battery_supply, sysfs_type, fs_type;
type sysfs_fpc_proximity, sysfs_type, fs_type; type sysfs_fpc_proximity, sysfs_type, fs_type;
type sysfs_graphics, sysfs_type, fs_type; type sysfs_graphics, sysfs_type, fs_type;
type sysfs_oem, sysfs_type, fs_type; type sysfs_oem, sysfs_type, fs_type;
type sysfs_usb_supply, sysfs_type, fs_type;
# data # data
type display_misc_file, file_type, data_file_type, core_data_file_type; type display_misc_file, file_type, data_file_type, core_data_file_type;

2
sepolicy/private/file_contexts
View file

@ -19,7 +19,7 @@
/system/bin/hw/android\.hardware\.light@2\.0-service\.oneplus_sdm845 u:object_r:hal_light_sdm845_exec:s0 /system/bin/hw/android\.hardware\.light@2\.0-service\.oneplus_sdm845 u:object_r:hal_light_sdm845_exec:s0
/system/bin/hw/lineage\.livedisplay@2\.0-service\.oneplus_sdm845 u:object_r:hal_livedisplay_sdm845_exec:s0 /system/bin/hw/lineage\.livedisplay@2\.0-service\.oneplus_sdm845 u:object_r:hal_livedisplay_sdm845_exec:s0
/system/bin/hw/lineage\.touch@1\.0-service\.oneplus_sdm845 u:object_r:hal_touch_sdm845_exec:s0 /system/bin/hw/lineage\.touch@1\.0-service\.oneplus_sdm845 u:object_r:hal_touch_sdm845_exec:s0
/system/bin/hw/lineage\.trust@1\.0-service\.oneplus_sdm845 u:object_r:hal_trust_sdm845_exec:s0 /system/bin/hw/lineage\.trust@1\.0-service u:object_r:hal_trust_default_exec:s0
# Modules # Modules
/system/lib/modules/wlan\.ko u:object_r:vendor_file:s0 /system/lib/modules/wlan\.ko u:object_r:vendor_file:s0

5
sepolicy/private/hal_trust_default.te Normal file
View file

@ -0,0 +1,5 @@
type hal_trust_default, coredomain, domain;
hal_server_domain(hal_trust_default, hal_lineage_trust)
type hal_trust_default_exec, exec_type, file_type;
init_daemon_domain(hal_trust_default)

9
sepolicy/private/hal_trust_sdm845.te
View file

@ -1,9 +0,0 @@
type hal_trust_sdm845, coredomain, domain;
hal_server_domain(hal_trust_sdm845, hal_lineage_trust)
type hal_trust_sdm845_exec, exec_type, file_type;
init_daemon_domain(hal_trust_sdm845)
# Allow access to otg toggle node
allow hal_trust_sdm845 sysfs_usb_supply:dir search;
allow hal_trust_sdm845 sysfs_usb_supply:file rw_file_perms;

11
trust/.clang-format
View file

@ -1,11 +0,0 @@
BasedOnStyle: Google
AccessModifierOffset: -2
AllowShortFunctionsOnASingleLine: Inline
ColumnLimit: 100
CommentPragmas: NOLINT:.*
DerivePointerAlignment: false
IndentWidth: 4
PointerAlignment: Left
TabWidth: 4
UseTab: Never
PenaltyExcessCharacter: 32

33
trust/Android.bp
View file

@ -1,33 +0,0 @@
//
// 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: "lineage.trust@1.0-service.oneplus_sdm845",
init_rc: ["lineage.trust@1.0-service.oneplus_sdm845.rc"],
defaults: ["hidl_defaults"],
relative_install_path: "hw",
srcs: [
"UsbRestrict.cpp",
"service.cpp",
],
shared_libs: [
"libbase",
"libbinder",
"libhidlbase",
"libhidltransport",
"libutils",
"vendor.lineage.trust@1.0",
],
}

55
trust/UsbRestrict.cpp
View file

@ -1,55 +0,0 @@
/*
* 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 <fstream>
#include "UsbRestrict.h"
#include <android-base/logging.h>
namespace vendor {
namespace lineage {
namespace trust {
namespace V1_0 {
namespace implementation {
static constexpr const char* kControlPath = "/sys/class/power_supply/usb/otg_switch";
// Methods from ::vendor::lineage::trust::V1_0::IUsbRestrict follow.
Return<bool> UsbRestrict::isEnabled() {
std::ifstream file(kControlPath);
std::string content;
file >> content;
file.close();
return !file.fail() && !std::stoi(content);
}
Return<void> UsbRestrict::setEnabled(bool enabled) {
std::ofstream file(kControlPath);
if (file.is_open()) {
file << (!enabled ? "1" : "0");
file.close();
} else {
LOG(ERROR) << "Failed to open " << kControlPath << ", error=" << errno << " ("
<< strerror(errno) << ")";
}
return Void();
}
} // namespace implementation
} // namespace V1_0
} // namespace trust
} // namespace lineage
} // namespace vendor

48
trust/UsbRestrict.h
View file

@ -1,48 +0,0 @@
/*
* 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_TRUST_V1_0_USBRESTRICT_H
#define VENDOR_LINEAGE_TRUST_V1_0_USBRESTRICT_H
#include <hidl/MQDescriptor.h>
#include <hidl/Status.h>
#include <vendor/lineage/trust/1.0/IUsbRestrict.h>
namespace vendor {
namespace lineage {
namespace trust {
namespace V1_0 {
namespace implementation {
using ::android::sp;
using ::android::hardware::Return;
using ::android::hardware::Void;
class UsbRestrict : public IUsbRestrict {
public:
UsbRestrict() = default;
// Methods from ::vendor::lineage::trust::V1_0::IUsbRestrict follow.
Return<bool> isEnabled() override;
Return<void> setEnabled(bool enabled) override;
};
} // namespace implementation
} // namespace V1_0
} // namespace trust
} // namespace lineage
} // namespace vendor
#endif // VENDOR_LINEAGE_TRUST_V1_0_USBRESTRICT_H

4
trust/lineage.trust@1.0-service.oneplus_sdm845.rc
View file

@ -1,4 +0,0 @@
service trust-hal-1-0 /system/bin/hw/lineage.trust@1.0-service.oneplus_sdm845
class hal
user root
group root

64
trust/service.cpp
View file

@ -1,64 +0,0 @@
/*
* 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.trust@1.0-service"
#include <android-base/logging.h>
#include <binder/ProcessState.h>
#include <hidl/HidlTransportSupport.h>
#include "UsbRestrict.h"
using android::OK;
using android::sp;
using android::status_t;
// libhwbinder:
using android::hardware::configureRpcThreadpool;
using android::hardware::joinRpcThreadpool;
using ::vendor::lineage::trust::V1_0::IUsbRestrict;
using ::vendor::lineage::trust::V1_0::implementation::UsbRestrict;
int main() {
sp<IUsbRestrict> usbRestrict;
status_t status;
LOG(INFO) << "Trust HAL service is starting.";
usbRestrict = new UsbRestrict();
if (usbRestrict == nullptr) {
LOG(ERROR) << "Can not create an instance of Trust HAL UsbRestricted Iface, exiting.";
goto shutdown;
}
configureRpcThreadpool(1, true /*callerWillJoin*/);
status = usbRestrict->registerAsService();
if (status != OK) {
LOG(ERROR) << "Could not register service for Trust HAL UsbRestricted Iface (" << status
<< ").";
}
LOG(INFO) << "Trust 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) << "Trust HAL service is shutting down.";
return 1;
}