diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk index 0f14ce2..6cd4b79 100644 --- a/universal7885-common/BoardConfigCommon.mk +++ b/universal7885-common/BoardConfigCommon.mk @@ -48,9 +48,6 @@ TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 -# Fingerprint -TARGET_SEC_FP_HAS_FINGERPRINT_GESTURES := true - # Init TARGET_INIT_VENDOR_LIB := //$(COMMON_PATH):libinit_universal7885 @@ -78,7 +75,7 @@ include device/samsung/universal7885-common/configs/props/props.mk # Recovery BOARD_HAS_DOWNLOAD_MODE := true -TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/recovery/recovery.fstab +TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/recovery.fstab # RIL ENABLE_VENDOR_RIL_SERVICE := true diff --git a/universal7885-common/aidl/Android.mk b/universal7885-common/aidl/Android.mk deleted file mode 100644 index 26e32a7..0000000 --- a/universal7885-common/aidl/Android.mk +++ /dev/null @@ -1,17 +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 $(call all-subdir-makefiles) diff --git a/universal7885-common/aidl/power-libperfmgr/powerhint.json.template b/universal7885-common/aidl/power-libperfmgr/powerhint.json.template deleted file mode 100644 index 1ffafd6..0000000 --- a/universal7885-common/aidl/power-libperfmgr/powerhint.json.template +++ /dev/null @@ -1,441 +0,0 @@ -{ - "Nodes": [ - { - "Name": "CPULittleClusterMaxFreq", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq", - "Values": [ - "9999999", - "1113600" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "CPULittleClusterMinFreq", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", - "Values": [ - "9999999", - "1113600", - "576000" - ], - "ResetOnInit": true - }, - { - "Name": "CPUBigClusterMaxFreq", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", - "Values": [ - "9999999", - "2016000", - "1497600", - "1401600" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "CPUBigClusterMinFreq", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", - "Values": [ - "9999999", - "1497600", - "1401600", - "1286400", - "0" - ], - "ResetOnInit": true - }, - { - "Name": "CPUBigPlusClusterMaxFreq", - "Path": "/sys/devices/system/cpu/cpu7/cpufreq/scaling_max_freq", - "Values": [ - "9999999", - "2016000", - "1497600", - "1401600" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "CPUBigPlusClusterMinFreq", - "Path": "/sys/devices/system/cpu/cpu7/cpufreq/scaling_min_freq", - "Values": [ - "9999999", - "1497600", - "1401600", - "1286400", - "0" - ], - "ResetOnInit": true - }, - { - "Name": "GPUMaxFreq", - "Path": "/sys/class/kgsl/kgsl-3d0/devfreq/max_freq", - "Values": [ - "585000000", - "427000000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "GPUMinFreq", - "Path": "/sys/class/kgsl/kgsl-3d0/devfreq/min_freq", - "Values": [ - "585000000", - "427000000", - "345000000", - "257000000" - ], - "ResetOnInit": true - }, - { - "Name": "TASchedtuneBoost", - "Path": "/dev/stune/top-app/schedtune.boost", - "Values": [ - "30", - "10" - ], - "ResetOnInit": true - }, - { - "Name": "PMQoSCpuDmaLatency", - "Path": "/dev/cpu_dma_latency", - "Values": [ - "44", - "100" - ], - "HoldFd": true - }, - { - "Name": "TouchscreenEnable", - "Path": "/sys/class/input/input3/enabled", - "Values": [ - "1", - "0" - ], - "ResetOnInit": true - }, - { - "Name": "DoubleTapToWakeEnable", - "Path": "/sys/class/sec/tsp/cmd", - "Values": [ - "aot_enable,0", - "aot_enable,1" - ], - "DefaultIndex": 0 - }, - { - "Name": "PowerHALMainState", - "Path": "vendor.powerhal.state", - "Values": [ - "SUSTAINED_PERFORMANCE", - "VR_MODE", - "VR_SUSTAINED_PERFORMANCE", - "" - ], - "Type": "Property" - }, - { - "Name": "PowerHALAudioState", - "Path": "vendor.powerhal.audio", - "Values": [ - "AUDIO_STREAMING_LOW_LATENCY", - "" - ], - "Type": "Property" - }, - { - "Name": "PowerHALRenderingState", - "Path": "vendor.powerhal.rendering", - "Values": [ - "EXPENSIVE_RENDERING", - "" - ], - "Type": "Property" - }, - { - "Name": "PowerHALPerfProfileState", - "Path": "vendor.powerhal.perf_profile", - "Values": [ - "POWER_SAVE", - "BIAS_POWER_SAVE", - "BIAS_PERFORMANCE", - "HIGH_PERFORMANCE" - ], - "Type": "Property" - } - ], - "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "CPUBigClusterMinFreq", - "Duration": 0, - "Value": "1286400" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPUBigPlusClusterMinFreq", - "Duration": 0, - "Value": "1286400" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPULittleClusterMinFreq", - "Duration": 0, - "Value": "1113600" - }, - { - "PowerHint": "INTERACTION", - "Node": "TASchedtuneBoost", - "Duration": 0, - "Value": "30" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUBigClusterMaxFreq", - "Duration": 5000, - "Value": "9999999" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUBigPlusClusterMaxFreq", - "Duration": 5000, - "Value": "9999999" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUBigClusterMinFreq", - "Duration": 5000, - "Value": "9999999" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUBigPlusClusterMinFreq", - "Duration": 5000, - "Value": "9999999" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPULittleClusterMinFreq", - "Duration": 5000, - "Value": "9999999" - }, - { - "PowerHint": "LAUNCH", - "Node": "PMQoSCpuDmaLatency", - "Duration": 5000, - "Value": "44" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUBigPlusClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUBigPlusClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPULittleClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPULittleClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "PMQoSCpuDmaLatency", - "Duration": 1000, - "Value": "44" - }, - { - "PowerHint": "CAMERA_STREAMING_MID", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "2016000" - }, - { - "PowerHint": "CAMERA_STREAMING_MID", - "Node": "CPUBigPlusClusterMaxFreq", - "Duration": 0, - "Value": "2016000" - }, - { - "PowerHint": "CAMERA_SHOT", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_SHOT", - "Node": "CPUBigPlusClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_SHOT", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_SHOT", - "Node": "CPUBigPlusClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_SHOT", - "Node": "CPULittleClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_SHOT", - "Node": "CPULittleClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_SHOT", - "Node": "PMQoSCpuDmaLatency", - "Duration": 1000, - "Value": "44" - }, - { - "PowerHint": "AUDIO_LAUNCH", - "Node": "PMQoSCpuDmaLatency", - "Duration": 2000, - "Value": "44" - }, - { - "PowerHint": "AUDIO_STREAMING_LOW_LATENCY", - "Node": "PowerHALAudioState", - "Duration": 0, - "Value": "AUDIO_STREAMING_LOW_LATENCY" - }, - { - "PowerHint": "AUDIO_STREAMING_LOW_LATENCY", - "Node": "PMQoSCpuDmaLatency", - "Duration": 0, - "Value": "44" - }, - { - "PowerHint": "SUSTAINED_PERFORMANCE", - "Node": "PowerHALMainState", - "Duration": 0, - "Value": "SUSTAINED_PERFORMANCE" - }, - { - "PowerHint": "SUSTAINED_PERFORMANCE", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "1401600" - }, - { - "PowerHint": "SUSTAINED_PERFORMANCE", - "Node": "CPUBigPlusClusterMaxFreq", - "Duration": 0, - "Value": "1401600" - }, - { - "PowerHint": "SUSTAINED_PERFORMANCE", - "Node": "CPULittleClusterMaxFreq", - "Duration": 0, - "Value": "1113600" - }, - { - "PowerHint": "SUSTAINED_PERFORMANCE", - "Node": "GPUMaxFreq", - "Duration": 0, - "Value": "427000000" - }, - { - "PowerHint": "VR_MODE", - "Node": "PowerHALMainState", - "Duration": 0, - "Value": "VR_MODE" - }, - { - "PowerHint": "VR_SUSTAINED_PERFORMANCE", - "Node": "PowerHALMainState", - "Duration": 0, - "Value": "VR_SUSTAINED_PERFORMANCE" - }, - { - "PowerHint": "EXPENSIVE_RENDERING", - "Node": "PowerHALRenderingState", - "Duration": 0, - "Value": "EXPENSIVE_RENDERING" - }, - { - "PowerHint": "EXPENSIVE_RENDERING", - "Node": "GPUMinFreq", - "Duration": 0, - "Value": "427000000" - }, - { - "PowerHint": "EXPENSIVE_RENDERING", - "Node": "GPUMaxFreq", - "Duration": 0, - "Value": "585000000" - }, - { - "PowerHint": "INTERACTIVE", - "Node": "TouchscreenEnable", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "DOUBLE_TAP_TO_WAKE", - "Node": "DoubleTapToWakeEnable", - "Duration": 0, - "Value": "aot_enable,1" - }, - { - "PowerHint": "PROFILE_POWER_SAVE", - "Node": "PowerHALPerfProfileState", - "Duration": 0, - "Value": "POWER_SAVE" - }, - { - "PowerHint": "PROFILE_BIAS_POWER_SAVE", - "Node": "PowerHALPerfProfileState", - "Duration": 0, - "Value": "BIAS_POWER_SAVE" - }, - { - "PowerHint": "PROFILE_BIAS_PERFORMANCE", - "Node": "PowerHALPerfProfileState", - "Duration": 0, - "Value": "BIAS_PERFORMANCE" - }, - { - "PowerHint": "PROFILE_HIGH_PERFORMANCE", - "Node": "PowerHALPerfProfileState", - "Duration": 0, - "Value": "HIGH_PERFORMANCE" - } - ] -} diff --git a/universal7885-common/hidl/fingerprint/Android.bp b/universal7885-common/hidl/fingerprint/Android.bp index 03e448f..47d8c60 100644 --- a/universal7885-common/hidl/fingerprint/Android.bp +++ b/universal7885-common/hidl/fingerprint/Android.bp @@ -17,6 +17,8 @@ cc_binary { "libbase", "libutils", "libhidlbase", + "android.hardware.biometrics.fingerprint@2.1", + "android.hardware.biometrics.fingerprint@2.2", "android.hardware.biometrics.fingerprint@2.3", ], } diff --git a/universal7885-common/hidl/keymaster/Android.bp b/universal7885-common/hidl/keymaster/Android.bp deleted file mode 100644 index 7ab3da3..0000000 --- a/universal7885-common/hidl/keymaster/Android.bp +++ /dev/null @@ -1,21 +0,0 @@ -cc_binary { - name: "android.hardware.keymaster@4.0-service.samsung", - defaults: ["hidl_defaults"], - proprietary: true, - init_rc: ["android.hardware.keymaster@4.0-service.samsung.rc"], - relative_install_path: "hw", - srcs: [ - "service.cpp", - ], - shared_libs: [ - "liblog", - "libcutils", - "libhardware", - "libbase", - "libutils", - "libhidlbase", - "android.hardware.keymaster@4.0", - "libskeymaster4device", - "libkeymaster4", - ], -} diff --git a/universal7885-common/hidl/keymaster/Android.mk b/universal7885-common/hidl/keymaster/Android.mk index 757078a..930c9d0 100644 --- a/universal7885-common/hidl/keymaster/Android.mk +++ b/universal7885-common/hidl/keymaster/Android.mk @@ -14,8 +14,6 @@ # limitations under the License. # -ifeq ($(TARGET_KEYMASTER_VARIANT),samsung) - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -42,5 +40,3 @@ LOCAL_MODULE_OWNER := samsung LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) - -endif # TARGET_KEYMASTER_VARIANT diff --git a/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml b/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml index 521ed5f..3811b5c 100644 --- a/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml +++ b/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml @@ -36,21 +36,6 @@ "/system/bin/surfaceflinger" GSM|CDMA|EVDO|WCDMA|LTE - - 0 - 1 - 20 - 21 - - - 0 - 10 - 20 - 30 - - - 40 - 100.0% MEMORY OFF @@ -94,14 +79,14 @@ 10 - + 0 12 7 - + 0 diff --git a/universal7885-common/recovery/recovery.fstab b/universal7885-common/rootdir/etc/recovery.fstab similarity index 100% rename from universal7885-common/recovery/recovery.fstab rename to universal7885-common/rootdir/etc/recovery.fstab diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk index 428136e..72f8db0 100644 --- a/universal7885-common/universal7885-common.mk +++ b/universal7885-common/universal7885-common.mk @@ -287,7 +287,7 @@ PRODUCT_SOONG_NAMESPACES += \ $(LOCAL_PATH) \ hardware/google/interfaces \ hardware/google/pixel \ - hardware/samsung/aidl/power-libperfmgr + device/samsung/universal7885-common/aidl/power-libperfmgr # Thermal HAL PRODUCT_PACKAGES += \