msm8953-common: Update remove_packages

msm8953-common: Unset BUILD_BROKEN_INCORRECT_PARTITION_IMAGES
Qualcomm targets can now build hermetic partitions. Change-Id: I241105e01d85fea983b34846ca675666ac07541b
2024-11-15 19:57:15 +00:00 · 2024-11-14 15:36:54 +09:00 · 2024-11-14 15:36:54 +09:00 · 2024-11-14 15:36:54 +09:00 · 2024-11-14 15:36:54 +09:00 · 2024-11-14 15:36:53 +09:00
25 changed files with 5680 additions and 1308 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -1,2 +1,30 @@
 soong_namespace {
 }
+
+install_symlink {
+    name: "firmware_WCNSS_qcom_cfg.ini_symlink",
+    vendor: true,
+    installed_location: "firmware/wlan/prima/WCNSS_qcom_cfg.ini",
+    symlink_target: "/vendor/etc/wifi/WCNSS_qcom_cfg.ini",
+}
+
+install_symlink {
+    name: "firmware_WCNSS_qcom_wlan_nv.bin_symlink",
+    vendor: true,
+    installed_location: "firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin",
+    symlink_target: "/mnt/vendor/persist/WCNSS_qcom_wlan_nv.bin",
+}
+
+install_symlink {
+    name: "firmware_WCNSS_wlan_dictionary.dat_symlink",
+    vendor: true,
+    installed_location: "firmware/wlan/prima/WCNSS_wlan_dictionary.dat",
+    symlink_target: "/mnt/vendor/persist/WCNSS_wlan_dictionary.dat",
+}
+
+install_symlink {
+    name: "firmware_wlan_mac.bin_symlink",
+    vendor: true,
+    installed_location: "firmware/wlan/prima/wlan_mac.bin",
+    symlink_target: "/mnt/vendor/persist/wlan_mac.bin",
+}
--- a/Android.mk
+++ b/Android.mk
@@ -26,83 +26,4 @@ $(DSP_MOUNT_POINT):
 	@echo "Creating $(DSP_MOUNT_POINT)"
 	@mkdir -p $(TARGET_OUT_VENDOR)/dsp

-IMS_LIBS := libimscamera_jni.so libimsmedia_jni.so
-
-IMS_SYMLINKS := $(addprefix $(TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED)/ims/lib/arm64/,$(notdir $(IMS_LIBS)))
-$(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@echo "IMS lib link: $@"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) ln -sf /system_ext/lib64/$(notdir $@) $@
-
-ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS)
-
-RFS_MSM_ADSP_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/adsp/
-$(RFS_MSM_ADSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@echo "Creating RFS MSM ADSP folder structure: $@"
-	@rm -rf $@/*
-	@mkdir -p $(dir $@)/readonly/vendor
-	$(hide) ln -sf /data/vendor/tombstones/rfs/lpass $@/ramdumps
-	$(hide) ln -sf /mnt/vendor/persist/rfs/msm/adsp $@/readwrite
-	$(hide) ln -sf /mnt/vendor/persist/rfs/shared $@/shared
-	$(hide) ln -sf /mnt/vendor/persist/hlos_rfs/shared $@/hlos
-	$(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware
-	$(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware
-
-RFS_MSM_MPSS_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/mpss/
-$(RFS_MSM_MPSS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@echo "Creating RFS MSM MPSS folder structure: $@"
-	@rm -rf $@/*
-	@mkdir -p $(dir $@)/readonly/vendor
-	$(hide) ln -sf /data/vendor/tombstones/rfs/modem $@/ramdumps
-	$(hide) ln -sf /mnt/vendor/persist/rfs/msm/mpss $@/readwrite
-	$(hide) ln -sf /mnt/vendor/persist/rfs/shared $@/shared
-	$(hide) ln -sf /mnt/vendor/persist/hlos_rfs/shared $@/hlos
-	$(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware
-	$(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware
-
-RFS_MSM_SLPI_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/slpi/
-$(RFS_MSM_SLPI_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@echo "Creating RFS MSM SLPI folder structure: $@"
-	@rm -rf $@/*
-	@mkdir -p $(dir $@)/readonly/vendor
-	$(hide) ln -sf /data/vendor/tombstones/rfs/slpi $@/ramdumps
-	$(hide) ln -sf /mnt/vendor/persist/rfs/msm/slpi $@/readwrite
-	$(hide) ln -sf /mnt/vendor/persist/rfs/shared $@/shared
-	$(hide) ln -sf /mnt/vendor/persist/hlos_rfs/shared $@/hlos
-	$(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware
-	$(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware
-
-ALL_DEFAULT_INSTALLED_MODULES += $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) $(RFS_MSM_SLPI_SYMLINKS)
-
-WCNSS_INI_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/prima/WCNSS_qcom_cfg.ini
-$(WCNSS_INI_SYMLINK): $(LOCAL_INSTALLED_MODULE)
-	@echo "WCNSS config ini link: $@"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) ln -sf /vendor/etc/wifi/$(notdir $@) $@
-
-WCNSS_BIN_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin
-$(WCNSS_BIN_SYMLINK): $(LOCAL_INSTALLED_MODULE)
-	@echo "WCNSS bin link: $@"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) ln -sf /mnt/vendor/persist/$(notdir $@) $@
-
-WCNSS_DAT_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/prima/WCNSS_wlan_dictionary.dat
-$(WCNSS_DAT_SYMLINK): $(LOCAL_INSTALLED_MODULE)
-	@echo "WCNSS dat link: $@"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) ln -sf /mnt/vendor/persist/$(notdir $@) $@
-
-WCNSS_MAC_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/prima/wlan_mac.bin
-$(WCNSS_MAC_SYMLINK): $(LOCAL_INSTALLED_MODULE)
-	@echo "WCNSS MAC bin link: $@"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) ln -sf /mnt/vendor/persist/$(notdir $@) $@
-
-ALL_DEFAULT_INSTALLED_MODULES += $(WCNSS_INI_SYMLINK) $(WCNSS_BIN_SYMLINK) $(WCNSS_DAT_SYMLINK) $(WCNSS_MAC_SYMLINK)
-
 endif
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -22,7 +22,6 @@ TARGET_2ND_CPU_VARIANT := cortex-a53
 # Build
 BUILD_BROKEN_DUP_RULES := true
 BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true
-BUILD_BROKEN_INCORRECT_PARTITION_IMAGES := true

 # Kernel
 BOARD_KERNEL_BASE := 0x80000000
@@ -69,7 +68,6 @@ TARGET_NO_BOOTLOADER := true
 USE_DEVICE_SPECIFIC_CAMERA := true
 TARGET_USES_QTI_CAMERA_DEVICE := true
 BOARD_QTI_CAMERA_32BIT_ONLY := true
-TARGET_TS_MAKEUP := true
 MALLOC_SVELTE_FOR_LIBC32 := true

 # Display
@@ -90,6 +88,11 @@ LOC_HIDL_VERSION := 3.0
 TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs

 # HIDL
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
+    $(COMMON_PATH)/framework_compatibility_matrix.xml \
+    hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \
+    hardware/qcom-caf/common/vendor_framework_compatibility_matrix_legacy.xml \
+    vendor/lineage/config/device_framework_matrix.xml
 DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml
 DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml

--- a/framework_compatibility_matrix.xml
+++ b/framework_compatibility_matrix.xml
@@ -0,0 +1,10 @@
+<compatibility-matrix version="2.0" type="framework">
+   <hal format="hidl">
+        <name>vendor.qti.hardware.radio.atcmdfwd</name>
+        <version>1.0</version>
+        <interface>
+            <name>IAtCmdFwd</name>
+            <instance>AtCmdFwdService</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,4 +1,4 @@
-<manifest version="2.0" type="device" target-level="4">
+<manifest version="2.0" type="device" target-level="5">
    <hal format="hidl">
        <name>android.hardware.audio</name>
        <transport>hwbinder</transport>
@@ -19,11 +19,6 @@
        <transport>hwbinder</transport>
        <fqname>@2.4::ICameraProvider/legacy/0</fqname>
    </hal>
-    <hal format="hidl">
-        <name>android.hardware.configstore</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.1::ISurfaceFlingerConfigs/default</fqname>
-    </hal>
    <hal format="hidl">
        <name>android.hardware.gatekeeper</name>
        <transport>hwbinder</transport>
@@ -98,11 +93,6 @@
        <transport>hwbinder</transport>
        <fqname>@1.0::IOffloadControl/default</fqname>
    </hal>
-    <hal format="hidl">
-        <name>android.hardware.vibrator</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.0::IVibrator/default</fqname>
-    </hal>
    <hal format="hidl">
        <name>com.qualcomm.qti.dpm.api</name>
        <transport>hwbinder</transport>
--- a/msm8953.mk
+++ b/msm8953.mk
@@ -8,9 +8,11 @@
 $(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk)

 # APEX
-$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
 OVERRIDE_PRODUCT_COMPRESSED_APEX := false

+# Add common definitions for Qualcomm
+$(call inherit-product, hardware/qcom-caf/common/common.mk)
+
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-lineage
@@ -111,11 +113,16 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
    android.frameworks.sensorservice@1.0.vendor \
    android.hardware.camera.provider@2.4-impl \
-    android.hardware.camera.provider@2.4-service
+    android.hardware.camera.provider@2.4-service \
+    android.hardware.camera.provider@2.5

 PRODUCT_PACKAGES += \
    libstdc++_vendor

+# Configstore
+PRODUCT_PACKAGES += \
+    disable_configstore
+
 # Display
 PRODUCT_PACKAGES += \
    android.frameworks.displayservice@1.0.vendor \
@@ -188,12 +195,11 @@ PRODUCT_COPY_FILES += \

 # Health
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.1-impl \
-    android.hardware.health@2.1-service
+    android.hardware.health-service.qti

 ifneq ($(AB_OTA_UPDATER),true)
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.1-impl.recovery
+    android.hardware.health-service.qti_recovery
 endif

 # HIDL
@@ -214,6 +220,9 @@ PRODUCT_PACKAGES += \
    libgui_shim \
    vendor.qti.hardware.camera.device@1.0

+PRODUCT_PACKAGES += \
+    libion.vendor
+
 # Input
 PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/keylayout/ft5435_ts.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/ft5435_ts.kl \
@@ -332,6 +341,11 @@ PRODUCT_PACKAGES += \
    librmnetctl \
    libxml2

+PRODUCT_PACKAGES += \
+    libnetutils.vendor \
+    libsqlite.vendor \
+    libssl.vendor
+
 # Sensors
 PRODUCT_PACKAGES += \
    android.frameworks.sensorservice@1.0.vendor \
@@ -339,6 +353,9 @@ PRODUCT_PACKAGES += \
    android.hardware.sensors@1.0-service \
    libsensorndkbridge

+PRODUCT_PACKAGES += \
+    libpower.vendor
+
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
    $(LOCAL_PATH) \
@@ -391,8 +408,10 @@ PRODUCT_PACKAGES += \

 # Vibrator
 PRODUCT_PACKAGES += \
-    android.hardware.vibrator@1.0-impl \
-    android.hardware.vibrator@1.0-service
+    vendor.qti.hardware.vibrator.service
+
+PRODUCT_COPY_FILES += \
+    vendor/qcom/opensource/vibrator/excluded-input-devices.xml:$(TARGET_COPY_OUT_VENDOR)/etc/excluded-input-devices.xml

 # Whitelisted app
 PRODUCT_COPY_FILES += \
@@ -420,5 +439,12 @@ PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/wifi/WCNSS_cfg.dat:$(TARGET_COPY_OUT_VENDOR)/firmware/wlan/prima/WCNSS_cfg.dat \
    $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini

+# Wifi firmware symlinks
+PRODUCT_PACKAGES += \
+    firmware_WCNSS_qcom_cfg.ini_symlink \
+    firmware_WCNSS_qcom_wlan_nv.bin_symlink \
+    firmware_WCNSS_wlan_dictionary.dat_symlink \
+    firmware_wlan_mac.bin_symlink
+
 # Inherit the proprietary files
 $(call inherit-product, vendor/xiaomi/msm8953-common/msm8953-common-vendor.mk)
--- a/parts/Android.bp
+++ b/parts/Android.bp
@@ -17,8 +17,4 @@ android_app {
    static_libs: [
        "org.lineageos.settings.resources",
    ],
-
-    optimize: {
-        proguard_flags_files: ["proguard.flags"],
-    },
 }
--- a/parts/proguard.flags
+++ b/parts/proguard.flags
@@ -1,23 +0,0 @@
-keep class org.lineageos.settings.dirac.* {
-  *;
-}
-
-keep class org.lineageos.settings.doze.* {
-  *;
-}
-
-keep class org.lineageos.settings.kcal.* {
-  *;
-}
-
-keep class org.lineageos.settings.soundcontrol.* {
-  *;
-}
-
-keep class org.lineageos.settings.torch.* {
-  *;
-}
-
-keep class org.lineageos.settings.vibration.* {
-  *;
-}
--- a/parts/src/org/lineageos/settings/dirac/DiracActivity.java
+++ b/parts/src/org/lineageos/settings/dirac/DiracActivity.java
@@ -19,7 +19,6 @@ package org.lineageos.settings.dirac;
 import android.os.Bundle;

 import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
-import com.android.settingslib.widget.R;

 public class DiracActivity extends CollapsingToolbarBaseActivity {

@@ -29,7 +28,8 @@ public class DiracActivity extends CollapsingToolbarBaseActivity {
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        getFragmentManager().beginTransaction().replace(R.id.content_frame,
+        getFragmentManager().beginTransaction().replace(
+                com.android.settingslib.collapsingtoolbar.R.id.content_frame,
                new DiracSettingsFragment(), TAG_DIRAC).commit();
    }
 }
--- a/parts/src/org/lineageos/settings/dirac/DiracSettingsFragment.java
+++ b/parts/src/org/lineageos/settings/dirac/DiracSettingsFragment.java
@@ -18,7 +18,7 @@ package org.lineageos.settings.dirac;

 import android.os.Bundle;
 import android.os.Handler;
-import android.widget.Switch;
+import android.widget.CompoundButton;

 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
@@ -27,12 +27,11 @@ import androidx.preference.PreferenceFragment;
 import androidx.preference.SwitchPreference;

 import com.android.settingslib.widget.MainSwitchPreference;
-import com.android.settingslib.widget.OnMainSwitchChangeListener;

 import org.lineageos.settings.R;

 public class DiracSettingsFragment extends PreferenceFragment implements
-        Preference.OnPreferenceChangeListener, OnMainSwitchChangeListener {
+        Preference.OnPreferenceChangeListener, CompoundButton.OnCheckedChangeListener {

    private static final String PREF_ENABLE = "dirac_enable";
    private static final String PREF_HEADSET = "dirac_headset_pref";
@@ -82,7 +81,7 @@ public class DiracSettingsFragment extends PreferenceFragment implements
    }

    @Override
-    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
        mDiracUtils.setEnabled(isChecked);
        if (isChecked) {
            mSwitchBar.setEnabled(false);
--- a/parts/src/org/lineageos/settings/doze/DozeSettingsActivity.java
+++ b/parts/src/org/lineageos/settings/doze/DozeSettingsActivity.java
@@ -20,7 +20,6 @@ package org.lineageos.settings.doze;
 import android.os.Bundle;

 import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
-import com.android.settingslib.widget.R;

 public class DozeSettingsActivity extends CollapsingToolbarBaseActivity {

@@ -30,7 +29,8 @@ public class DozeSettingsActivity extends CollapsingToolbarBaseActivity {
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        getFragmentManager().beginTransaction().replace(R.id.content_frame,
+        getFragmentManager().beginTransaction().replace(
+                com.android.settingslib.collapsingtoolbar.R.id.content_frame,
                new DozeSettingsFragment(), TAG_DOZE).commit();
    }
 }
--- a/parts/src/org/lineageos/settings/doze/DozeSettingsFragment.java
+++ b/parts/src/org/lineageos/settings/doze/DozeSettingsFragment.java
@@ -25,7 +25,8 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.widget.Switch;
+import android.widget.CompoundButton;
+
 import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceChangeListener;
 import androidx.preference.PreferenceCategory;
@@ -35,10 +36,9 @@ import androidx.preference.SwitchPreference;
 import org.lineageos.settings.R;

 import com.android.settingslib.widget.MainSwitchPreference;
-import com.android.settingslib.widget.OnMainSwitchChangeListener;

-public class DozeSettingsFragment extends PreferenceFragment implements OnPreferenceChangeListener,
-        OnMainSwitchChangeListener {
+public class DozeSettingsFragment extends PreferenceFragment implements
+        Preference.OnPreferenceChangeListener, CompoundButton.OnCheckedChangeListener {

    private MainSwitchPreference mSwitchBar;

@@ -91,7 +91,7 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer
    }

    @Override
-    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
        DozeUtils.enableDoze(getActivity(), isChecked);
        DozeUtils.checkDozeService(getActivity());

--- a/parts/src/org/lineageos/settings/kcal/KCalSettingsActivity.java
+++ b/parts/src/org/lineageos/settings/kcal/KCalSettingsActivity.java
@@ -23,7 +23,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;

 import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
-import com.android.settingslib.widget.R;

 public class KCalSettingsActivity extends CollapsingToolbarBaseActivity implements Utils {

@@ -32,13 +31,13 @@ public class KCalSettingsActivity extends CollapsingToolbarBaseActivity implemen
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_kcal);
+        setContentView(com.android.settingslib.collapsingtoolbar.R.layout.activity_kcal);

-        Fragment fragment = getFragmentManager().findFragmentById(R.id.fragment_kcal);
+        Fragment fragment = getFragmentManager().findFragmentById(com.android.settingslib.collapsingtoolbar.R.id.fragment_kcal);
        if (fragment == null) {
            mKCalSettingsFragment = new KCalSettings();
            getFragmentManager().beginTransaction()
-                    .add(R.id.fragment_kcal, mKCalSettingsFragment)
+                    .add(com.android.settingslib.collapsingtoolbar.R.id.fragment_kcal, mKCalSettingsFragment)
                    .commit();
        } else {
            mKCalSettingsFragment = (KCalSettings) fragment;
@@ -48,11 +47,11 @@ public class KCalSettingsActivity extends CollapsingToolbarBaseActivity implemen
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        switch (item.getItemId()) {
-            case android.R.id.home:
+            case com.android.settingslib.collapsingtoolbar.R.id.home:
                finish();
                return true;

-            case R.id.action_reset:
+            case com.android.settingslib.collapsingtoolbar.R.id.action_reset:
                mKCalSettingsFragment.applyValues(RED_DEFAULT + " " +
                        GREEN_DEFAULT + " " +
                        BLUE_DEFAULT + " " +
@@ -65,7 +64,7 @@ public class KCalSettingsActivity extends CollapsingToolbarBaseActivity implemen
                mKCalSettingsFragment.setmSetOnBoot(SETONBOOT_DEFAULT);
                return true;

-            case R.id.action_preset:
+            case com.android.settingslib.collapsingtoolbar.R.id.action_preset:
                new PresetDialog().show(getFragmentManager(),
                        KCalSettingsActivity.class.getName(), mKCalSettingsFragment);
                return true;
@@ -79,7 +78,7 @@ public class KCalSettingsActivity extends CollapsingToolbarBaseActivity implemen
    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        MenuInflater menuInflater = getMenuInflater();
-        menuInflater.inflate(R.menu.menu_reset, menu);
+        menuInflater.inflate(com.android.settingslib.collapsingtoolbar.R.menu.menu_reset, menu);
        return true;
    }
 }
--- a/parts/src/org/lineageos/settings/soundcontrol/SoundControlSettingsActivity.java
+++ b/parts/src/org/lineageos/settings/soundcontrol/SoundControlSettingsActivity.java
@@ -22,7 +22,6 @@ import android.os.Bundle;
 import android.view.MenuItem;

 import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
-import com.android.settingslib.widget.R;

 public class SoundControlSettingsActivity extends CollapsingToolbarBaseActivity {

@@ -32,11 +31,11 @@ public class SoundControlSettingsActivity extends CollapsingToolbarBaseActivity
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        Fragment fragment = getFragmentManager().findFragmentById(android.R.id.content);
+        Fragment fragment = getFragmentManager().findFragmentById(com.android.settingslib.collapsingtoolbar.R.id.content_frame);
        if (fragment == null) {
            mSoundControlSettingsFragment = new SoundControlSettings();
            getFragmentManager().beginTransaction()
-                    .add(R.id.content_frame, mSoundControlSettingsFragment)
+                    .add(com.android.settingslib.collapsingtoolbar.R.id.content_frame, mSoundControlSettingsFragment)
                    .commit();
        } else {
            mSoundControlSettingsFragment = (SoundControlSettings) fragment;
--- a/parts/src/org/lineageos/settings/speaker/ClearSpeakerActivity.java
+++ b/parts/src/org/lineageos/settings/speaker/ClearSpeakerActivity.java
@@ -19,7 +19,6 @@ package org.lineageos.settings.speaker;
 import android.os.Bundle;

 import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
-import com.android.settingslib.widget.R;

 public class ClearSpeakerActivity extends CollapsingToolbarBaseActivity {

@@ -29,7 +28,7 @@ public class ClearSpeakerActivity extends CollapsingToolbarBaseActivity {
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        getFragmentManager().beginTransaction().replace(R.id.content_frame,
+        getFragmentManager().beginTransaction().replace(com.android.settingslib.collapsingtoolbar.R.id.content_frame,
                new ClearSpeakerFragment(), TAG_CLEARSPEAKER).commit();
    }
 }
--- a/parts/src/org/lineageos/settings/torch/TorchSettingsActivity.java
+++ b/parts/src/org/lineageos/settings/torch/TorchSettingsActivity.java
@@ -22,7 +22,6 @@ import android.os.Bundle;
 import android.view.MenuItem;

 import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
-import com.android.settingslib.widget.R;

 public class TorchSettingsActivity extends CollapsingToolbarBaseActivity {

@@ -32,11 +31,11 @@ public class TorchSettingsActivity extends CollapsingToolbarBaseActivity {
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        Fragment fragment = getFragmentManager().findFragmentById(android.R.id.content);
+        Fragment fragment = getFragmentManager().findFragmentById(com.android.settingslib.collapsingtoolbar.R.id.content_frame);
        if (fragment == null) {
            mTorchSettingsFragment = new TorchSettings();
            getFragmentManager().beginTransaction()
-                    .add(R.id.content_frame, mTorchSettingsFragment)
+                    .add(com.android.settingslib.collapsingtoolbar.R.id.content_frame, mTorchSettingsFragment)
                    .commit();
        } else {
            mTorchSettingsFragment = (TorchSettings) fragment;
--- a/parts/src/org/lineageos/settings/vibration/VibratorActivity.java
+++ b/parts/src/org/lineageos/settings/vibration/VibratorActivity.java
@@ -19,7 +19,6 @@ package org.lineageos.settings.vibration;
 import android.app.ActionBar;
 import android.os.Bundle;
 import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
-import com.android.settingslib.widget.R;

 public class VibratorActivity extends CollapsingToolbarBaseActivity {

@@ -27,7 +26,7 @@ public class VibratorActivity extends CollapsingToolbarBaseActivity {
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        getFragmentManager().beginTransaction()
-                .replace(R.id.content_frame, new VibratorSettings())
+                .replace(com.android.settingslib.collapsingtoolbar.R.id.content_frame, new VibratorSettings())
                .commit();
    }
 }
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,4 +1,5 @@
 # All unpinned blobs below are extracted from daisy-user 10 QKQ1.191002.002 V11.0.21.0.QDLMIXM release-keys
+# caymanslm: caymanslm-user 12 SKQ1.211103.001 8450120221101 release-keys

 # ADSP
 vendor/bin/adsprpcd
@@ -435,7 +436,7 @@ vendor/lib64/vendor.display.color@1.0.so
 vendor/lib64/vendor.display.postproc@1.0.so
 vendor/lib64/vendor.qti.hardware.qdutils_disp@1.0.so

-# Power-off alarm - from caymanslm - SKQ1.211103.001
+# Power-off alarm - from caymanslm
 product/app/PowerOffAlarm/PowerOffAlarm.apk:system_ext/app/PowerOffAlarm/PowerOffAlarm.apk|f0a86fc11b38c059912303857bc4c79155430bcc
 vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service|37b4999095331f4f3dd6c118ee0bdea4bdf7f003
 vendor/bin/power_off_alarm|04e651db91ca2598f1bf50453fdb49a63463b2dc
@@ -586,8 +587,8 @@ product/lib64/lib-imsvt.so:system_ext/lib64/lib-imsvt.so
 product/lib64/lib-imsvtextutils.so:system_ext/lib64/lib-imsvtextutils.so
 product/lib64/lib-imsvtutils.so:system_ext/lib64/lib-imsvtutils.so
 product/lib64/libdiag_system.so:system_ext/lib64/libdiag_system.so
-product/lib64/libimscamera_jni.so:system_ext/lib64/libimscamera_jni.so
-product/lib64/libimsmedia_jni.so:system_ext/lib64/libimsmedia_jni.so
+product/lib64/libimscamera_jni.so:system_ext/lib64/libimscamera_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm64/libimscamera_jni.so
+product/lib64/libimsmedia_jni.so:system_ext/lib64/libimsmedia_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm64/libimsmedia_jni.so
 product/lib64/vendor.qti.ims.callinfo@1.0.so:system_ext/lib64/vendor.qti.ims.callinfo@1.0.so
 product/lib64/vendor.qti.ims.rcsconfig@1.0.so:system_ext/lib64/vendor.qti.ims.rcsconfig@1.0.so
 product/lib64/vendor.qti.imsrtpservice@2.0.so:system_ext/lib64/vendor.qti.imsrtpservice@2.0.so
--- a/remove_packages/Android.mk
+++ b/remove_packages/Android.mk
@@ -4,7 +4,11 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := RemovePackages
 LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_TAGS := optional
-LOCAL_OVERRIDES_PACKAGES := AudioFX Photos PixelWallpapers2021
+LOCAL_OVERRIDES_PACKAGES := Aperture AudioFX Backgrounds Calendar2 Calendar Etar PicoTts
+LOCAL_OVERRIDES_PACKAGES += DeviceAsWebcam Gallery2 Glimpse PhotoTable Recorder
+LOCAL_OVERRIDES_PACKAGES += GoogleTTS SafetyHubPrebuilt WellbeingPrebuilt
+LOCAL_OVERRIDES_PACKAGES += Photos TagGoogle talkback OdadPrebuilt
+LOCAL_OVERRIDES_PACKAGES += PrebuiltBugle bcr CreativeAssistant
 LOCAL_UNINSTALLABLE_MODULE := true
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_SRC_FILES := /dev/null
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -501,13 +501,6 @@ service vendor.ril-daemon2 /vendor/bin/hw/rild -c 2
    group radio cache inet misc audio sdcard_r sdcard_rw diag log readproc wakelock
    capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW

-service charger /system/bin/charger
-    class charger
-    user system
-    group system graphics input
-    capabilities SYS_BOOT
-    seclabel u:r:charger:s0
-
 service vendor.msm_irqbalance /vendor/bin/msm_irqbalance -f /system/vendor/etc/msm_irqbalance.conf
    class core
    user root
--- a/rro_overlays/CarrierConfigOverlay/Android.bp
+++ b/rro_overlays/CarrierConfigOverlay/Android.bp
@@ -1,7 +1,11 @@
+//
+// Copyright (C) 2024 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
 runtime_resource_overlay {
    name: "CarrierConfigOverlay",
-    theme: "CarrierConfigOverlay",
-    sdk_version: "current",
    product_specific: true,
    aaptflags: ["--keep-raw-values"],
 }
--- a/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml
+++ b/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml
@@ -1,26 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
+<!--
+     Copyright (C) 2024 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
 -->
-<!-- Xiaomi sm8150 specific carrier overlays -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.carrierconfig.tissot"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" android:allowBackup="false"/>
-    <overlay
-      android:targetPackage="com.android.carrierconfig"
-      android:isStatic="true"
-      android:priority="0"/>
+    package="com.android.carrierconfig.overlay.tissot">
+    <application android:allowBackup="false"/>
+    <overlay android:targetPackage="com.android.carrierconfig"
+                   android:isStatic="true"
+                   android:priority="100"/>
 </manifest>
--- a/rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
+++ b/rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
--- a/vendor.prop
+++ b/vendor.prop
@@ -73,7 +73,6 @@ vidc.enc.dcvs.extra-buff-count=2

 # Charger
 ro.charger.disable_init_blank=true
-ro.charger.enable_suspend=true

 # CNE
 persist.vendor.cne.feature=1
--- a/wifi/wpa_supplicant_overlay.conf
+++ b/wifi/wpa_supplicant_overlay.conf
@@ -3,3 +3,4 @@ p2p_disabled=1
 tdls_external_control=1
 wowlan_triggers=magic_pkt
 driver_param=use_p2p_group_interface=1
+pmf=0
Author	SHA1	Message	Date
Joey Huab	ec98dc3eaf	msm8953-common: Update remove_packages	2024-11-15 19:57:15 +00:00
Bruno Martins	5608d5f756	msm8953-common: Unset BUILD_BROKEN_INCORRECT_PARTITION_IMAGES Qualcomm targets can now build hermetic partitions. Change-Id: I241105e01d85fea983b34846ca675666ac07541b	2024-11-14 15:36:54 +09:00
Bruno Martins	b43a7dfeb1	msm8953-common: Declare IMS libs as symlinks during extraction Change-Id: Ia1b8097d28dd4888232fe383b830515b1b9bafaa	2024-11-14 15:36:54 +09:00
Bruno Martins	35f040e687	msm8953-common: Move to new RFS install_symlink targets Change-Id: I9560fd0da00958d9349a0881b5a5f64a2c02e495	2024-11-14 15:36:54 +09:00
Bruno Martins	a8ec4e5bf6	msm8953-common: Convert WiFi firmware symlinks to install_symlink targets The last bit that was preventing building hermetic images. Change-Id: I2d1651a13f910949621ac14fa0dbc1ebe630f2cb	2024-11-14 15:36:54 +09:00
Giovanni Ricca	ad88522ed7	msm8953-common: Specify `caymanslm` source at the top Change-Id: Iee0ae1f85148985edce4f06d3b3a40450d70877d	2024-11-14 15:36:53 +09:00
Giovanni Ricca	7ecac7baca	msm8953-common: Decommonize `TARGET_TS_MAKEUP` * Only oreo (and below) targets actually use this feature. Change-Id: I2e74031f99d4a473c4f214128b18d201f824d9d0	2024-11-14 15:36:53 +09:00
Han Sol Jin	450fda568b	msm8953-common: Explicitly disable protected management frames This fixes support with WPA2/3 mixed access points; the primary issue was that while this device doesn't support PMF, said access points try to query for PMF in order to check for WPA3 support, which causes our WLAN driver to die a painful death. Disable it from the overlay, as AOSP enables it by default. It's a wonder why it was enabled in the first place. Change-Id: I89dbce7ae4c91cea9f1828e8b627a828e2b08011	2024-11-14 15:36:53 +09:00
Michael Bestas	e841cd1dd6	msm8953-common: Build missing libraries for 14 QPR3 Change-Id: I6a84526ca1e9f4e5140c8068646433cab3fe85b2	2024-11-14 15:36:53 +09:00
Giovanni Ricca	8a13c5d0c5	msm8953-common: Add `atcmdfwd` on framework compatibility matrix Change-Id: I9943e6510a014523c3e13e2ff3599c5a1bd6135f	2024-11-14 15:36:53 +09:00
Michael Bestas	42cffb2d0d	msm8953-common: Inherit from legacy QTI FCM Change-Id: I0bde1c273d4abe689f61e7d4ebcf80965d785489	2024-11-14 15:36:52 +09:00
Michael Bestas	03e8ad31a9	msm8953-common: Include lineage FCM Change-Id: Ib4408e941d920a3a38132ba1c8360994f5534c0b	2024-11-14 15:36:52 +09:00
Bruno Martins	7e9cc66dfd	msm8953-common: Inherit from QTI FCM Change-Id: I0bdd4d63b60a1e29cdd69e71f7268932a105c16b	2024-11-14 15:36:52 +09:00
Tim Zimmermann	1cc03c756f	msm8953-common: Set manifest target-level to 5 Change-Id: Ic72d17ebdb388dee9e63e27a36190c93c095fb0c	2024-11-14 15:36:52 +09:00
Bruno Martins	310c7a8dd8	msm8953-common: Move to QTI health AIDL service The health AIDL HAL service provides functionalities of charger, therefore system charger at /system/bin/charger is deprecated. On top of that, QTI health AIDL HAL service enables suspend by default, the equivalent of setting ro.charger.enable_suspend for legacy charger. Change-Id: I59c23e7974cea1174b0161f31a535fa3afa1e5c9	2024-11-14 15:36:52 +09:00
Michael Bestas	4bf3958b7d	msm8953-common: Switch to QTI vibrator HAL Change-Id: I911001c14167f7dfceb609090f7b90117310da07	2024-11-14 15:36:52 +09:00
Alexander Koskovich	fd301c4297	msm8953-common: Disable the usage of ConfigStore. * As per commit `11a113a67e` ("Add disable_configstore"). [SebaUbuntu] Remove manifest entry as well Change-Id: I5482989a8a96227a3e2a5317eacf613c641bfa8e	2024-11-14 15:36:52 +09:00
Adithya R	86f77e6e8d	msm8953-common: parts: Get rid of proguard flags This is obsolete. Change-Id: I1b692d3e1a96c49ac6efd54907ea23c4b4494f7e	2024-11-14 15:36:47 +09:00
pengfeix	f462f49e06	msm8953-common: overlay: Enable IMS feature flags for supported carriers - Enable VoLTE/VoWIFI for all indian cariers - Enable VoLTE for Viettel Vietnam - Enable VoLTE for Mobifone Vietnam - Add full Support Carrier Smartfren VoLTE - Enable VoLTE support for Indosat and XL Axiata - Enable VoLTE support for Telkomsel (Indonesia) - Enable VoLTE support for Three - Enable VoLTE support for Bakcell (Azerbaijan) Signed-off-by: Frost <159105703+Karan-Frost@users.noreply.github.com>	2024-10-12 04:45:02 +09:00
althafvly	654dc2d129	msm8953-common: Update CarrierConfig from munch V816.0.2.0.ULMMIXM Change-Id: I4df6ab6ac380b3eeed1ab6ed64f64bc0e0d0ed3f	2024-10-12 04:44:59 +09:00
Omkar Chandorkar	33fe40db1a	msm8953-common: overlay: Update CarrierConfig from phone1 * From Nothing OS 2.0.4 Signed-off-by: flakeforever <113103193+flakeforever@users.noreply.github.com>	2024-10-12 04:44:54 +09:00
Arian	702e5af505	msm8953-common: overlay: Update CarrierConfig from unicorn V816.0.3.0.ULECNXM	2024-04-23 17:11:57 +09:00
Joey	7bafbcbd92	msm8953-common: Update remove_packages	2024-04-17 22:46:00 +09:00
Peter Kalauskas	3f0b50ad13	msm8953-common: parts: Enable use_resource_processor for all sysui deps This will make the build faster Test: m checkbuild Bug: 295208392 Change-Id: I0c1bd901429bbe3bf81c1530e156735f8637a96e	2024-04-10 01:11:38 +09:00
Chaohui Wang	b2ea49cba5	msm8953-common: parts: Migrate to CompoundButton.OnCheckedChangeListener Switch and SwitchCompat are both CompoundButton. Using CompoundButton in Java will helps migration in the future. Bug: 306658427 Test: manual - check Settings pages Test: m RunSettingsLibRoboTests Change-Id: I85a70d4c504d8584030ea4a058f30d74206ab835	2024-04-10 00:53:06 +09:00
basamaryan	6b73526154	msm8953-common: Don't explicitly include updatable_apex.mk It is inherited by base_system.mk as of QPR2 Change-Id: I020a05b233f61ea28d03199cbc76051e6e97e1dc	2024-03-28 12:46:10 +03:00