From c5afdb6c1d3ccd6524bb7760357a3a7ca00c04ca Mon Sep 17 00:00:00 2001 From: ivanmeler Date: Thu, 1 Dec 2022 14:19:46 +0000 Subject: [PATCH] gts3l-common to msm8996-common --- Android.mk | 2 +- AudioRotationMonitor/Android.mk | 17 ---- AudioRotationMonitor/AndroidManifest.xml | 30 ------- AudioRotationMonitor/proguard.flags | 3 - AudioRotationMonitor/service/Android.mk | 14 --- .../service/set-audio-rotation.cpp | 79 ---------------- .../service/set-audio-rotation.rc | 2 - .../BootCompletedReceiver.java | 32 ------- .../audiorotationmonitor/DisplayListener.java | 89 ------------------- .../DisplayListenerService.java | 54 ----------- BoardConfigCommon.mk | 5 +- README.md | 3 +- bluetooth/bdroid_buildcfg.h | 2 +- ...mera_gts3.xml => msm8996_camera_heroq.xml} | 0 light/Android.mk | 4 +- ...oid.hardware.light@2.0-service.msm8996.rc} | 2 +- light/include/samsung_lights.h | 2 +- livedisplay/Android.bp | 8 +- ...ineage.livedisplay@2.0-service.msm8996.rc} | 2 +- gts3l.mk => msm8996.mk | 23 ++--- .../TetheringOverlay/AndroidManifest.xml | 2 +- rro_overlays/WifiOverlay/AndroidManifest.xml | 2 +- sepolicy/file_contexts | 5 +- sepolicy/set-audio-rotation.te | 8 -- setup-makefiles.sh | 2 +- thermal/thermal.c | 2 +- touch/Android.bp | 6 +- touch/service.cpp | 2 +- ...ndor.lineage.touch@1.0-service.msm8996.rc} | 2 +- ...dor.lineage.touch@1.0-service.msm8996.xml} | 0 30 files changed, 36 insertions(+), 368 deletions(-) delete mode 100644 AudioRotationMonitor/Android.mk delete mode 100644 AudioRotationMonitor/AndroidManifest.xml delete mode 100644 AudioRotationMonitor/proguard.flags delete mode 100644 AudioRotationMonitor/service/Android.mk delete mode 100644 AudioRotationMonitor/service/set-audio-rotation.cpp delete mode 100644 AudioRotationMonitor/service/set-audio-rotation.rc delete mode 100644 AudioRotationMonitor/src/org/lineageos/audiorotationmonitor/BootCompletedReceiver.java delete mode 100644 AudioRotationMonitor/src/org/lineageos/audiorotationmonitor/DisplayListener.java delete mode 100644 AudioRotationMonitor/src/org/lineageos/audiorotationmonitor/DisplayListenerService.java rename camera/{msm8996_camera_gts3.xml => msm8996_camera_heroq.xml} (100%) rename light/{android.hardware.light@2.0-service.gts3l.rc => android.hardware.light@2.0-service.msm8996.rc} (91%) rename livedisplay/{vendor.lineage.livedisplay@2.0-service.gts3l.rc => vendor.lineage.livedisplay@2.0-service.msm8996.rc} (55%) rename gts3l.mk => msm8996.mk (97%) delete mode 100644 sepolicy/set-audio-rotation.te rename touch/{vendor.lineage.touch@1.0-service.gts3l.rc => vendor.lineage.touch@1.0-service.msm8996.rc} (92%) rename touch/{vendor.lineage.touch@1.0-service.gts3l.xml => vendor.lineage.touch@1.0-service.msm8996.xml} (100%) diff --git a/Android.mk b/Android.mk index 1ac56c4..558d184 100644 --- a/Android.mk +++ b/Android.mk @@ -25,7 +25,7 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(filter gts3llte gts3lwifi,$(TARGET_DEVICE)),) +ifneq ($(filter heroqlte hero2qlte,$(TARGET_DEVICE)),) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/AudioRotationMonitor/Android.mk b/AudioRotationMonitor/Android.mk deleted file mode 100644 index 992c9d9..0000000 --- a/AudioRotationMonitor/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := AudioRotationMonitor -LOCAL_CERTIFICATE := platform -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_PROGUARD_FLAG_FILES := proguard.flags - -include $(BUILD_PACKAGE) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/AudioRotationMonitor/AndroidManifest.xml b/AudioRotationMonitor/AndroidManifest.xml deleted file mode 100644 index e179d13..0000000 --- a/AudioRotationMonitor/AndroidManifest.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/AudioRotationMonitor/proguard.flags b/AudioRotationMonitor/proguard.flags deleted file mode 100644 index bc0051c..0000000 --- a/AudioRotationMonitor/proguard.flags +++ /dev/null @@ -1,3 +0,0 @@ --keep class org.lineageos.audiorotationmonitor.* { - *; -} diff --git a/AudioRotationMonitor/service/Android.mk b/AudioRotationMonitor/service/Android.mk deleted file mode 100644 index 6b21877..0000000 --- a/AudioRotationMonitor/service/Android.mk +++ /dev/null @@ -1,14 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := set-audio-rotation -LOCAL_MODULE_TAGS := optional -LOCAL_INIT_RC := set-audio-rotation.rc -LOCAL_SRC_FILES := \ - set-audio-rotation.cpp -LOCAL_SHARED_LIBRARIES := \ - libbase \ - libtinyalsa - -include $(BUILD_EXECUTABLE) diff --git a/AudioRotationMonitor/service/set-audio-rotation.cpp b/AudioRotationMonitor/service/set-audio-rotation.cpp deleted file mode 100644 index 69f9b09..0000000 --- a/AudioRotationMonitor/service/set-audio-rotation.cpp +++ /dev/null @@ -1,79 +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 "set-audio-rotation" - -#include -#include - -constexpr int SLOT_POSITIONS_0[] = { 0, 1, 0, 1 }; -constexpr int SLOT_POSITIONS_90[] = { 1, 1, 0, 0 }; -constexpr int SLOT_POSITIONS_180[] = { 1, 0, 1, 0 }; -constexpr int SLOT_POSITIONS_270[] = { 0, 0, 1, 1 }; - -void setMixerValueByName(mixer *mixer, const char *name, int value) { - const auto ctl = mixer_get_ctl_by_name(mixer, name); - - if (ctl == nullptr) { - LOG(ERROR) << "Failed to find mixer ctl for " << name; - return; - } - - if (mixer_ctl_set_value(ctl, 0, value) < 0) { - LOG(ERROR) << "Failed to set ctl value " << value << " for " << name; - return; - } -} - -void setSlotPositions(const int *values) { - const auto mixer = mixer_open(0); - - if (mixer == nullptr) { - LOG(ERROR) << "Failed to open mixer"; - return; - } - - setMixerValueByName(mixer, "ExtSPK LL TDM_ADC_SEL", values[0]); - setMixerValueByName(mixer, "ExtSPK LR TDM_ADC_SEL", values[1]); - setMixerValueByName(mixer, "ExtSPK UL TDM_ADC_SEL", values[2]); - setMixerValueByName(mixer, "ExtSPK UR TDM_ADC_SEL", values[3]); - - setMixerValueByName(mixer, "ExtSPK LL TDM_DAC_SEL", values[0]); - setMixerValueByName(mixer, "ExtSPK LR TDM_DAC_SEL", values[1]); - setMixerValueByName(mixer, "ExtSPK UL TDM_DAC_SEL", values[2]); - setMixerValueByName(mixer, "ExtSPK UR TDM_DAC_SEL", values[3]); - - mixer_close(mixer); -}; - -int main(int argc, char **argv) { - if (argc != 2) { - return -1; - } - - if (strcmp(argv[1], "0") == 0) { - setSlotPositions(SLOT_POSITIONS_0); - } else if (strcmp(argv[1], "1") == 0) { - setSlotPositions(SLOT_POSITIONS_90); - } else if (strcmp(argv[1], "2") == 0) { - setSlotPositions(SLOT_POSITIONS_180); - } else if (strcmp(argv[1], "3") == 0) { - setSlotPositions(SLOT_POSITIONS_270); - } else { - return -1; - } - - return 0; -} diff --git a/AudioRotationMonitor/service/set-audio-rotation.rc b/AudioRotationMonitor/service/set-audio-rotation.rc deleted file mode 100644 index 5dd4329..0000000 --- a/AudioRotationMonitor/service/set-audio-rotation.rc +++ /dev/null @@ -1,2 +0,0 @@ -on property:sys.audio.rotation=* - exec - root audio -- /system/bin/set-audio-rotation ${sys.audio.rotation} diff --git a/AudioRotationMonitor/src/org/lineageos/audiorotationmonitor/BootCompletedReceiver.java b/AudioRotationMonitor/src/org/lineageos/audiorotationmonitor/BootCompletedReceiver.java deleted file mode 100644 index 3ef3d76..0000000 --- a/AudioRotationMonitor/src/org/lineageos/audiorotationmonitor/BootCompletedReceiver.java +++ /dev/null @@ -1,32 +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. - */ - -package org.lineageos.audiorotationmonitor; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.util.Log; - -public class BootCompletedReceiver extends BroadcastReceiver { - private static final String TAG = "AudioRotationMonitor"; - - @Override - public void onReceive(final Context context, Intent intent) { - Log.d(TAG, "Starting"); - context.startService(new Intent(context, DisplayListenerService.class)); - } -} diff --git a/AudioRotationMonitor/src/org/lineageos/audiorotationmonitor/DisplayListener.java b/AudioRotationMonitor/src/org/lineageos/audiorotationmonitor/DisplayListener.java deleted file mode 100644 index d4d28d9..0000000 --- a/AudioRotationMonitor/src/org/lineageos/audiorotationmonitor/DisplayListener.java +++ /dev/null @@ -1,89 +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. - */ - -package org.lineageos.audiorotationmonitor; - -import android.content.Context; -import android.hardware.display.DisplayManager; -import android.os.Handler; -import android.os.SystemProperties; -import android.util.Log; -import android.view.Surface; -import android.view.WindowManager; - -public class DisplayListener implements DisplayManager.DisplayListener { - private static final boolean DEBUG = true; - private static final String TAG = "DisplayListener"; - - private static final String AUDIO_ROTATION_PROP = "sys.audio.rotation"; - - private Context mContext; - private Handler mHandler; - - private DisplayManager mDisplayManager; - private WindowManager mWindowManager; - - private final Object mRotationLock = new Object(); - private int mDeviceRotation = Surface.ROTATION_0; - - public DisplayListener(Context context) { - mContext = context; - mHandler = new Handler(); - - mDisplayManager = mContext.getSystemService(DisplayManager.class); - mWindowManager = mContext.getSystemService(WindowManager.class); - } - - @Override - public void onDisplayAdded(int displayId) { - if (DEBUG) Log.d(TAG, "onDisplayAdded"); - } - - @Override - public void onDisplayRemoved(int displayId) { - if (DEBUG) Log.d(TAG, "onDisplayRemoved"); - } - - @Override - public void onDisplayChanged(int displayId) { - if (DEBUG) Log.d(TAG, "onDisplayChanged"); - updateOrientation(); - } - - private void updateOrientation() { - // Even though we're responding to device orientation events, - // use display rotation so audio stays in sync with video/dialogs - int newRotation = mWindowManager.getDefaultDisplay().getRotation(); - - synchronized (mRotationLock) { - if (newRotation != mDeviceRotation) { - mDeviceRotation = newRotation; - SystemProperties.set(AUDIO_ROTATION_PROP, String.valueOf(mDeviceRotation)); - } - } - } - - public void enable() { - if (DEBUG) Log.d(TAG, "Enabling"); - mDisplayManager.registerDisplayListener(this, mHandler); - updateOrientation(); - } - - public void disable() { - if (DEBUG) Log.d(TAG, "Disabling"); - mDisplayManager.unregisterDisplayListener(this); - } -} diff --git a/AudioRotationMonitor/src/org/lineageos/audiorotationmonitor/DisplayListenerService.java b/AudioRotationMonitor/src/org/lineageos/audiorotationmonitor/DisplayListenerService.java deleted file mode 100644 index 0897db7..0000000 --- a/AudioRotationMonitor/src/org/lineageos/audiorotationmonitor/DisplayListenerService.java +++ /dev/null @@ -1,54 +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. - */ - -package org.lineageos.audiorotationmonitor; - -import android.app.Service; -import android.content.Intent; -import android.os.IBinder; -import android.util.Log; - -public class DisplayListenerService extends Service { - private static final String TAG = "DisplayListenerService"; - private static final boolean DEBUG = true; - - private DisplayListener mDisplayListener; - - @Override - public void onCreate() { - if (DEBUG) Log.d(TAG, "Creating service"); - mDisplayListener = new DisplayListener(this); - } - - @Override - public int onStartCommand(Intent intent, int flags, int startId) { - if (DEBUG) Log.d(TAG, "Starting service"); - mDisplayListener.enable(); - return START_STICKY; - } - - @Override - public void onDestroy() { - if (DEBUG) Log.d(TAG, "Destroying service"); - mDisplayListener.disable(); - super.onDestroy(); - } - - @Override - public IBinder onBind(Intent intent) { - return null; - } -} diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 4551a92..145f053 100755 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -17,7 +17,7 @@ BOARD_VENDOR := samsung -COMMON_PATH := device/samsung/gts3l-common +COMMON_PATH := device/samsung/msm8996-common # Architecture TARGET_ARCH := arm64 @@ -42,7 +42,8 @@ TARGET_NO_BOOTLOADER := true # Kernel BOARD_KERNEL_BASE := 0x80000000 -BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7464900.sdhci lpm_levels.sleep_disabled=1 rcupdate.rcu_expedited=1 cma=32M@0-0xffffffff loop.max_part=7 +BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=746900.sdhci lpm_levels.sleep_disabled=1 rcupdate.rcu_expedited=1 cma=32M@0-0xffffffff +#BOARD_KERNEL_CMDLINE := loop.max_part=7 BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb BOARD_KERNEL_PAGESIZE := 4096 diff --git a/README.md b/README.md index 4bd7e7c..150e812 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Common Device Tree for Samsung Galaxy Tab S3 +# Common Device Tree for Samsung S7 QCOM ## Copyright @@ -6,6 +6,7 @@ Copyright (C) 2017 The LineageOS Project Copyright (C) 2018-2020 Valera Chigir Copyright (C) 2021-2022 Deokgyu Yang +Copyright (C) 2022 Ivan Meler ``` ## License diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h index f21e4cc..268588d 100755 --- a/bluetooth/bdroid_buildcfg.h +++ b/bluetooth/bdroid_buildcfg.h @@ -22,7 +22,7 @@ #ifndef _BDROID_BUILDCFG_H #define _BDROID_BUILDCFG_H -#define BTM_DEF_LOCAL_NAME "Samsung Galaxy Tab S3" +#define BTM_DEF_LOCAL_NAME "Samsung Galaxy S7" #define BLUETOOTH_QTI_SW TRUE #define MAX_ACL_CONNECTIONS 16 #define MAX_L2CAP_CHANNELS 16 diff --git a/camera/msm8996_camera_gts3.xml b/camera/msm8996_camera_heroq.xml similarity index 100% rename from camera/msm8996_camera_gts3.xml rename to camera/msm8996_camera_heroq.xml diff --git a/light/Android.mk b/light/Android.mk index d1c42a1..b462b1a 100644 --- a/light/Android.mk +++ b/light/Android.mk @@ -31,8 +31,8 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ android.hardware.light@2.0 -LOCAL_MODULE := android.hardware.light@2.0-service.gts3l -LOCAL_INIT_RC := android.hardware.light@2.0-service.gts3l.rc +LOCAL_MODULE := android.hardware.light@2.0-service.msm8996 +LOCAL_INIT_RC := android.hardware.light@2.0-service.msm8996.rc LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_MODULE_OWNER := samsung diff --git a/light/android.hardware.light@2.0-service.gts3l.rc b/light/android.hardware.light@2.0-service.msm8996.rc similarity index 91% rename from light/android.hardware.light@2.0-service.gts3l.rc rename to light/android.hardware.light@2.0-service.msm8996.rc index 3a0205a..5616e24 100644 --- a/light/android.hardware.light@2.0-service.gts3l.rc +++ b/light/android.hardware.light@2.0-service.msm8996.rc @@ -1,4 +1,4 @@ -service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.gts3l +service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.msm8996 interface android.hardware.light@2.0::ILight default class hal user system diff --git a/light/include/samsung_lights.h b/light/include/samsung_lights.h index ca08700..c0f88a1 100644 --- a/light/include/samsung_lights.h +++ b/light/include/samsung_lights.h @@ -29,7 +29,7 @@ #define PANEL_MAX_BRIGHTNESS_NODE "/sys/class/leds/lcd-backlight/max_brightness" #define BUTTON_BRIGHTNESS_NODE "/sys/class/sec/sec_touchkey/brightness" -// Those two paths don't exist in the Galaxy Tab S3 sysfs +// Those two paths don't exist in the Galaxy S7 QCOM sysfs #define LED_BLINK_NODE "/sys/class/sec/led/led_blink" #define LED_BLN_NODE "/sys/class/misc/backlightnotification/notification_led" diff --git a/livedisplay/Android.bp b/livedisplay/Android.bp index b859d27..fd8c2d6 100644 --- a/livedisplay/Android.bp +++ b/livedisplay/Android.bp @@ -13,7 +13,7 @@ // limitations under the License. cc_defaults { - name: "livedisplay_samsung_gts3l_defaults", + name: "livedisplay_samsung_msm8996_defaults", defaults: ["hidl_defaults"], relative_install_path: "hw", srcs: [ @@ -31,8 +31,8 @@ cc_defaults { } cc_binary { - name: "vendor.lineage.livedisplay@2.0-service.gts3l", - init_rc: ["vendor.lineage.livedisplay@2.0-service.gts3l.rc"], - defaults: ["livedisplay_samsung_gts3l_defaults"], + name: "vendor.lineage.livedisplay@2.0-service.msm8996", + init_rc: ["vendor.lineage.livedisplay@2.0-service.msm8996.rc"], + defaults: ["livedisplay_samsung_msm8996_defaults"], vendor: true, } diff --git a/livedisplay/vendor.lineage.livedisplay@2.0-service.gts3l.rc b/livedisplay/vendor.lineage.livedisplay@2.0-service.msm8996.rc similarity index 55% rename from livedisplay/vendor.lineage.livedisplay@2.0-service.gts3l.rc rename to livedisplay/vendor.lineage.livedisplay@2.0-service.msm8996.rc index 9d620d7..2ea5247 100644 --- a/livedisplay/vendor.lineage.livedisplay@2.0-service.gts3l.rc +++ b/livedisplay/vendor.lineage.livedisplay@2.0-service.msm8996.rc @@ -1,7 +1,7 @@ on post-fs-data mkdir /data/vendor/display 0770 system system -service livedisplay-hal-2-0-gts3l /vendor/bin/hw/vendor.lineage.livedisplay@2.0-service.gts3l +service livedisplay-hal-2-0-msm8996 /vendor/bin/hw/vendor.lineage.livedisplay@2.0-service.msm8996 class late_start user system group system diff --git a/gts3l.mk b/msm8996.mk similarity index 97% rename from gts3l.mk rename to msm8996.mk index 5d5c924..c5ab060 100755 --- a/gts3l.mk +++ b/msm8996.mk @@ -15,10 +15,10 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_n.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_m.mk) # Get non-open-source specific aspects -$(call inherit-product-if-exists, vendor/samsung/gts3l-common/gts3l-common-vendor.mk) +$(call inherit-product-if-exists, vendor/samsung/msm8996-common/msm8996-common-vendor.mk) # Overlays DEVICE_PACKAGE_OVERLAYS += \ @@ -31,11 +31,8 @@ PRODUCT_AAPT_CONFIG := normal PRODUCT_AAPT_PREF_CONFIG := xhdpi # Boot animation -TARGET_SCREEN_HEIGHT := 2048 -TARGET_SCREEN_WIDTH := 1536 - -# Device characteristics -PRODUCT_CHARACTERISTICS := tablet +TARGET_SCREEN_HEIGHT := 2560 +TARGET_SCREEN_WIDTH := 1440 # Permissions PRODUCT_COPY_FILES += \ @@ -100,9 +97,7 @@ PRODUCT_PACKAGES += \ libqcomvoiceprocessing \ libvolumelistener \ tinymix \ - libaudioprimary_shim \ - AudioRotationMonitor \ - set-audio-rotation + libaudioprimary_shim PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/audio/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml \ @@ -135,7 +130,7 @@ PRODUCT_PACKAGES += \ Snap PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/camera/msm8996_camera_gts3.xml:$(TARGET_COPY_OUT_VENDOR)/firmware/msm8996_camera_gts3.xml \ + $(LOCAL_PATH)/camera/msm8996_camera_heroq.xml:$(TARGET_COPY_OUT_VENDOR)/firmware/msm8996_camera_gts3.xml \ $(LOCAL_PATH)/camera/N05QL_s5k5e3yx_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/firmware/N05QL_s5k5e3yx_chromatix.xml \ $(LOCAL_PATH)/camera/W13QS_imx258_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/firmware/W13QS_imx258_chromatix.xml @@ -251,11 +246,11 @@ PRODUCT_PACKAGES += \ # Lights PRODUCT_PACKAGES += \ - android.hardware.light@2.0-service.gts3l + android.hardware.light@2.0-service.msm8996 # LiveDisplay PRODUCT_PACKAGES += \ - vendor.lineage.livedisplay@2.0-service.gts3l + vendor.lineage.livedisplay@2.0-service.msm8996 # Media PRODUCT_COPY_FILES += \ @@ -393,7 +388,7 @@ PRODUCT_PACKAGES += \ # Touch PRODUCT_PACKAGES += \ - vendor.lineage.touch@1.0-service.gts3l + vendor.lineage.touch@1.0-service.msm8996 # Trust HAL PRODUCT_PACKAGES += \ diff --git a/rro_overlays/TetheringOverlay/AndroidManifest.xml b/rro_overlays/TetheringOverlay/AndroidManifest.xml index 6eeef4a..d29cdc9 100644 --- a/rro_overlays/TetheringOverlay/AndroidManifest.xml +++ b/rro_overlays/TetheringOverlay/AndroidManifest.xml @@ -1,5 +1,5 @@ diff --git a/rro_overlays/WifiOverlay/AndroidManifest.xml b/rro_overlays/WifiOverlay/AndroidManifest.xml index 1543744..98ca18e 100644 --- a/rro_overlays/WifiOverlay/AndroidManifest.xml +++ b/rro_overlays/WifiOverlay/AndroidManifest.xml @@ -15,7 +15,7 @@ --> diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index f6f1c4b..51dd481 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -19,7 +19,6 @@ /(vendor|system/vendor)/bin/hw/macloader u:object_r:macloader_exec:s0 /(vendor|system/vendor)/bin/secril_config_svc u:object_r:secril_config_svc_exec:s0 /system/bin/lpm u:object_r:charger_exec:s0 -/system/bin/set-audio-rotation u:object_r:set-audio-rotation_exec:s0 # CPU tunable for EAS /sys/devices/system/cpu/cpu[0-3]/cpufreq/schedutil(/.*)? u:object_r:sysfs_devices_system_cpu:s0 @@ -178,8 +177,8 @@ /(vendor|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service\.samsung u:object_r:hal_light_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.usb@1\.2-service-qti u:object_r:hal_usb_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.fastcharge@1\.0-service\.samsung u:object_r:hal_lineage_fastcharge_default_exec:s0 -/(vendor|system/vendor)/bin/hw/vendor\.lineage\.livedisplay@2\.0-service\.gts3l u:object_r:hal_lineage_livedisplay_sysfs_exec:s0 -/(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service\.gts3l u:object_r:hal_lineage_touch_default_exec:s0 +/(vendor|system/vendor)/bin/hw/vendor\.lineage\.livedisplay@2\.0-service\.msm8996 u:object_r:hal_lineage_livedisplay_sysfs_exec:s0 +/(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service\.msm8996 u:object_r:hal_lineage_touch_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.miscpower@1\.0-service u:object_r:hal_power_default_exec:s0 # Rootfs diff --git a/sepolicy/set-audio-rotation.te b/sepolicy/set-audio-rotation.te deleted file mode 100644 index 14410e5..0000000 --- a/sepolicy/set-audio-rotation.te +++ /dev/null @@ -1,8 +0,0 @@ -type set-audio-rotation, domain, coredomain; -type set-audio-rotation_exec, exec_type, file_type; - -init_daemon_domain(set-audio-rotation) - -# Allow set-audio-rotation to read and write to audio_device -allow set-audio-rotation audio_device:dir r_dir_perms; -allow set-audio-rotation audio_device:chr_file rw_file_perms; diff --git a/setup-makefiles.sh b/setup-makefiles.sh index b19fbdc..e3ff8d6 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -25,7 +25,7 @@ source "${HELPER}" setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true # Warning headers and guards -write_headers "gts3llte gts3lwifi" +write_headers "heroqlte hero2qlte" # The standard common blobs write_makefiles "${MY_DIR}/proprietary-files.txt" true diff --git a/thermal/thermal.c b/thermal/thermal.c index 84640f6..4dd967c 100644 --- a/thermal/thermal.c +++ b/thermal/thermal.c @@ -273,7 +273,7 @@ thermal_module_t HAL_MODULE_INFO_SYM = { .module_api_version = THERMAL_HARDWARE_MODULE_API_VERSION_0_1, .hal_api_version = HARDWARE_HAL_API_VERSION, .id = THERMAL_HARDWARE_MODULE_ID, - .name = "Galaxy Tab S3 Thermal HAL", + .name = "Galaxy S7 QCOM Thermal HAL", .author = "The Android Open Source Project", .methods = &thermal_module_methods, }, diff --git a/touch/Android.bp b/touch/Android.bp index 5bd39d8..13e4d89 100644 --- a/touch/Android.bp +++ b/touch/Android.bp @@ -13,9 +13,9 @@ // limitations under the License. cc_binary { - name: "vendor.lineage.touch@1.0-service.gts3l", - init_rc: ["vendor.lineage.touch@1.0-service.gts3l.rc"], - vintf_fragments: ["vendor.lineage.touch@1.0-service.gts3l.xml"], + name: "vendor.lineage.touch@1.0-service.msm8996", + init_rc: ["vendor.lineage.touch@1.0-service.msm8996.rc"], + vintf_fragments: ["vendor.lineage.touch@1.0-service.msm8996.xml"], defaults: ["hidl_defaults"], relative_install_path: "hw", vendor: true, diff --git a/touch/service.cpp b/touch/service.cpp index 29109e3..676940c 100644 --- a/touch/service.cpp +++ b/touch/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "vendor.lineage.touch@1.0-service.gts3l" +#define LOG_TAG "vendor.lineage.touch@1.0-service.msm8996" #include #include diff --git a/touch/vendor.lineage.touch@1.0-service.gts3l.rc b/touch/vendor.lineage.touch@1.0-service.msm8996.rc similarity index 92% rename from touch/vendor.lineage.touch@1.0-service.gts3l.rc rename to touch/vendor.lineage.touch@1.0-service.msm8996.rc index a795a25..09f13dc 100644 --- a/touch/vendor.lineage.touch@1.0-service.gts3l.rc +++ b/touch/vendor.lineage.touch@1.0-service.msm8996.rc @@ -3,7 +3,7 @@ on init chown system system /sys/class/sec/sec_touchkey/input/enabled chmod 0660 /sys/class/sec/sec_touchkey/input/enabled -service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.gts3l +service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.msm8996 class hal user system group system diff --git a/touch/vendor.lineage.touch@1.0-service.gts3l.xml b/touch/vendor.lineage.touch@1.0-service.msm8996.xml similarity index 100% rename from touch/vendor.lineage.touch@1.0-service.gts3l.xml rename to touch/vendor.lineage.touch@1.0-service.msm8996.xml