marge test

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" default="true">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/workspace.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="NONE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="aa7aa75f-bbe5-4cf6-b0ca-6eb4e2da4b0e" name="Changes" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ClangdSettings">
+    <option name="formatViaClangd" value="false" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="lineage-21" />
+      </map>
+    </option>
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 8
+}</component>
+  <component name="ProjectId" id="2mwU4jtd4Su3ju1FlEXXuYdDFj7" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "RunOnceActivity.readMode.enableVisualFormatting": "true",
+    "cf.first.check.clang-format": "false",
+    "cidr.known.project.marker": "true",
+    "dart.analysis.tool.window.visible": "false",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "/home/rogers/Documentos/android_device_motorola_sm7325-common",
+    "settings.editor.selected.configurable": "project.propVCSSupport.CommitDialog",
+    "show.migrate.to.gradle.popup": "false"
+  }
+}]]></component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="aa7aa75f-bbe5-4cf6-b0ca-6eb4e2da4b0e" name="Changes" comment="" />
+      <created>1727986943592</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1727986943592</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>

Android.bp

@@ -3,6 +3,8 @@
 // This file is generated by device/motorola/sm7325-common/setup-makefiles.sh
 
 soong_namespace {
+	imports: [
+	],
 }
 
 cc_prebuilt_library_shared {
@@ -60,6 +62,7 @@ android_app_import {
 	name: "CneApp",
 	owner: "motorola",
 	apk: "proprietary/vendor/app/CneApp/CneApp.apk",
+	required: ["CneApp.libvndfwk_detect_jni.qti_symlink"],
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -89,17 +92,6 @@ android_app_import {
 	soc_specific: true,
 }
 
-android_app_import {
-	name: "PowerOffAlarm",
-	owner: "motorola",
-	apk: "proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	product_specific: true,
-}
-
 android_app_import {
 	name: "uimgbaservice",
 	owner: "motorola",
@@ -122,6 +114,17 @@ android_app_import {
 	system_ext_specific: true,
 }
 
+android_app_import {
+	name: "PowerOffAlarm",
+	owner: "motorola",
+	apk: "proprietary/system_ext/app/PowerOffAlarm/PowerOffAlarm.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "QtiTelephony",
 	owner: "motorola",
@@ -225,13 +228,6 @@ dex_import {
 	product_specific: true,
 }
 
-dex_import {
-	name: "moto-telephony",
-	owner: "motorola",
-	jars: ["proprietary/system_ext/framework/moto-telephony.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "com.qti.dpmframework",
 	owner: "motorola",
@@ -246,6 +242,13 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "moto-telephony",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/moto-telephony.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "qcrilhook",
 	owner: "motorola",
@@ -281,6 +284,13 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "vendor.qti.ims.connectionaidlservice-V1-java",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.connectionaidlservice-V1-java.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "vendor.qti.ims.factory-V1.1-java",
 	owner: "motorola",
@@ -309,6 +319,13 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "vendor.qti.ims.factoryaidlservice-V1-java",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.factoryaidlservice-V1-java.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "vendor.qti.ims.rcssip-V1.0-java",
 	owner: "motorola",
@@ -330,6 +347,13 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "vendor.qti.ims.rcssipaidlservice-V1-java",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcssipaidlservice-V1-java.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "vendor.qti.ims.rcsuce-V1.0-java",
 	owner: "motorola",
@@ -352,7 +376,7 @@ dex_import {
 }
 
 prebuilt_etc_xml {
-	name: "manifest_android.hardware.drm@1.3-service.widevine",
+	name: "manifest_android.hardware.drm@1.3-service.widevine.xml",
 	owner: "motorola",
 	src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml",
 	filename_from_src: true,
@@ -361,7 +385,7 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "vendor.dolby.media.c2@1.0-service",
+	name: "vendor.dolby.media.c2@1.0-service.xml",
 	owner: "motorola",
 	src: "proprietary/vendor/etc/vintf/manifest/vendor.dolby.media.c2@1.0-service.xml",
 	filename_from_src: true,
@@ -370,7 +394,7 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "vendor.qti.diag.hal.service",
+	name: "vendor.qti.diag.hal.service.xml",
 	owner: "motorola",
 	src: "proprietary/vendor/etc/vintf/manifest/vendor.qti.diag.hal.service.xml",
 	filename_from_src: true,
@@ -379,16 +403,16 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "vendor.qti.gnss@4.0-service",
+	name: "vendor.qti.gnss@4.2-service.xml",
 	owner: "motorola",
-	src: "proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml",
+	src: "proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@4.2-service.xml",
 	filename_from_src: true,
 	sub_dir: "vintf/manifest",
 	soc_specific: true,
 }
 
 prebuilt_etc_xml {
-	name: "vendor.qti.hardware.servicetracker@1.2-service",
+	name: "vendor.qti.hardware.servicetracker@1.2-service.xml",
 	owner: "motorola",
 	src: "proprietary/vendor/etc/vintf/manifest/vendor.qti.hardware.servicetracker@1.2-service.xml",
 	filename_from_src: true,
@@ -396,3 +420,66 @@ prebuilt_etc_xml {
 	soc_specific: true,
 }
 
+install_symlink {
+	name: "libimscamera_jni_libimscamera_jni_symlink64",
+	system_ext_specific: true,
+	installed_location: "priv-app/ims/lib/arm64/libimscamera_jni.so",
+	symlink_target: "/system_ext/lib64/libimscamera_jni.so",
+}
+
+install_symlink {
+	name: "libimsmedia_jni_libimsmedia_jni_symlink64",
+	system_ext_specific: true,
+	installed_location: "priv-app/ims/lib/arm64/libimsmedia_jni.so",
+	symlink_target: "/system_ext/lib64/libimsmedia_jni.so",
+}
+
+install_symlink {
+	name: "motobox_expat_symlink64",
+	soc_specific: true,
+	installed_location: "bin/expat",
+	symlink_target: "/vendor/bin/motobox",
+}
+
+install_symlink {
+	name: "libEGL_adreno_libEGL_adreno_symlink32",
+	soc_specific: true,
+	installed_location: "lib/libEGL_adreno.so",
+	symlink_target: "/vendor/lib/egl/libEGL_adreno.so",
+}
+
+install_symlink {
+	name: "libGLESv2_adreno_libGLESv2_adreno_symlink32",
+	soc_specific: true,
+	installed_location: "lib/libGLESv2_adreno.so",
+	symlink_target: "/vendor/lib/egl/libGLESv2_adreno.so",
+}
+
+install_symlink {
+	name: "libq3dtools_adreno_libq3dtools_adreno_symlink32",
+	soc_specific: true,
+	installed_location: "lib/libq3dtools_adreno.so",
+	symlink_target: "/vendor/lib/egl/libq3dtools_adreno.so",
+}
+
+install_symlink {
+	name: "libEGL_adreno_libEGL_adreno_symlink64",
+	soc_specific: true,
+	installed_location: "lib64/libEGL_adreno.so",
+	symlink_target: "/vendor/lib64/egl/libEGL_adreno.so",
+}
+
+install_symlink {
+	name: "libGLESv2_adreno_libGLESv2_adreno_symlink64",
+	soc_specific: true,
+	installed_location: "lib64/libGLESv2_adreno.so",
+	symlink_target: "/vendor/lib64/egl/libGLESv2_adreno.so",
+}
+
+install_symlink {
+	name: "libq3dtools_adreno_libq3dtools_adreno_symlink64",
+	soc_specific: true,
+	installed_location: "lib64/libq3dtools_adreno.so",
+	symlink_target: "/vendor/lib64/egl/libq3dtools_adreno.so",
+}
+

proprietary/system/etc/sysconfig/qti_whitelist.xml

@@ -106,12 +106,11 @@
     <hidden-api-whitelisted-app package="com.android.bluetooth" />
     <hidden-api-whitelisted-app package="org.codeaurora.bluetooth" />
     <hidden-api-whitelisted-app package="com.qualcomm.qti.qmmi" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.perfdump" />
     <hidden-api-whitelisted-app package="com.qualcomm.wfd.client" />
     <hidden-api-whitelisted-app package="com.qualcomm.wfd.service" />
     <hidden-api-whitelisted-app package="com.qualcomm.qti.server.wigigapp" />
     <!-- These are location components that need to freely run in the background -->
     <allow-in-power-save package="com.qualcomm.location" />
-    <allow-in-power-save package="com.qualcomm.location.XT" />
-    <allow-in-power-save package="com.qualcomm.location.XT.setup" />
     <hidden-api-whitelisted-app package="com.qti.service.colorservice" />
 </config>

proprietary/system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.2-service.rc

@@ -5,33 +5,44 @@
 #
 
 on post-fs-data
-    mkdir /dev/socket/qcc_app 0770 system vendor_qtr
+    mkdir /dev/socket/qcc_app 0770 system misc
     chmod 2770 /dev/socket/qcc_app
 
-    mkdir /data/misc/qcc 0770 system vendor_qtr
+    mkdir /data/misc/qcc 0770 system misc
-    mkdir /data/misc/qcc/up 0770 system vendor_qtr
+    mkdir /data/misc/qcc/up 0770 system misc
-    mkdir /data/misc/qcc/down 0770 system vendor_qtr
+    mkdir /data/misc/qcc/down 0770 system misc
-    mkdir /data/misc/qcc/conf 0770 system vendor_qtr
+    mkdir /data/misc/qcc/down/200 0770 system misc
-    mkdir /data/misc/qcc/shared 0770 system vendor_qtr
+    mkdir /data/misc/qcc/conf 0770 system misc
-    mkdir /data/misc/qcc/down/200 0770 system vendor_qtr
+    mkdir /data/misc/qcc/shared 0770 system misc
+    mkdir /data/misc/qcc/file_agent 0770 system misc
+    chown system misc /data/misc/qcc/file_agent
 
 on property:vendor.qti.qcc.oper.mode=1
     write /data/misc/qcc/conf/qcc.conf "OperationMode:1"
-    chown system vendor_qtr /data/misc/qcc/conf/qcc.conf
+    chown system misc /data/misc/qcc/conf/qcc.conf
+    chmod 0660 /data/misc/qcc/conf/qcc.conf
 
 on property:vendor.qti.qcc.oper.mode=2
     write /data/misc/qcc/conf/qcc.conf "OperationMode:2"
-    chown system vendor_qtr /data/misc/qcc/conf/qcc.conf
+    chown system misc /data/misc/qcc/conf/qcc.conf
+    chmod 0660 /data/misc/qcc/conf/qcc.conf
 
 on property:vendor.qti.qcc.oper.mode=3
     write /data/misc/qcc/conf/qcc.conf "OperationMode:3"
-    chown system vendor_qtr /data/misc/qcc/conf/qcc.conf
+    chown system misc /data/misc/qcc/conf/qcc.conf
+    chmod 0660 /data/misc/qcc/conf/qcc.conf
 
 on property:vendor.qti.qcc.oper.mode=4
     write /data/misc/qcc/conf/qcc.conf "OperationMode:4"
-    chown system vendor_qtr /data/misc/qcc/conf/qcc.conf
+    chown system misc /data/misc/qcc/conf/qcc.conf
+    chmod 0660 /data/misc/qcc/conf/qcc.conf
+
+on property:vendor.qti.qcc.oper.mode=6
+    write /data/misc/qcc/conf/qcc.conf "OperationMode:6"
+    chown system misc /data/misc/qcc/conf/qcc.conf
+    chmod 0660 /data/misc/qcc/conf/qcc.conf
 
 service qccsyshal@1.2-service /system/system_ext/bin/qccsyshal@1.2-service
     class hal
     user system
-    group vendor_qtr system
+    group misc system

proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml

@@ -26,4 +26,12 @@
         file="/system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar"/>
     <library name="vendor.qti.ims.rcssip-V1.2-java"
         file="/system_ext/framework/vendor.qti.ims.rcssip-V1.2-java.jar"/>
+    <library name="vendor.qti.ims.factoryaidlservice-V1-java"
+        file="/system_ext/framework/vendor.qti.ims.factoryaidlservice-V1-java.jar"/>
+    <library name="vendor.qti.ims.rcssipaidlservice-V1-java"
+         file="/system_ext/framework/vendor.qti.ims.rcssipaidlservice-V1-java.jar"/>
+    <library name="vendor.qti.ims.rcsuceaidlservice-V1-java"
+         file="/system_ext/framework/vendor.qti.ims.rcsuceaidlservice-V1-java.jar"/>
+    <library name="vendor.qti.ims.connectionaidlservice-V1-java"
+         file="/system_ext/framework/vendor.qti.ims.connectionaidlservice-V1-java.jar"/>
 </permissions>

proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
-  Copyright (c) 2020 Qualcomm Technologies, Inc.
+  Copyright (c) 2020, 2023 Qualcomm Technologies, Inc.
   All Rights Reserved.
   Confidential and Proprietary - Qualcomm Technologies, Inc.
 -->
 <permissions>
     <privapp-permissions package="com.qualcomm.wfd.service">
         <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
+        <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
     </privapp-permissions>
 </permissions>

proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<!--
+  Copyright (c) 2021 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+
+<!--
+This XML file declares which system packages should be initially installed for new users based on
+their user type. All system packages on the device should ideally have an entry in an xml file
+(keyed by its manifest name).
+
+Base user-types (every user will be at least one of these types) are:
+ - SYSTEM    (user 0)
+ - FULL      (any non-profile human user)
+ - PROFILE   (profile human user)
+the precise meaning of which is defined in
+frameworks/base/core/java/android/content/pm/UserInfo.java.
+
+Changes to the whitelist during system updates can result in installing additional system packages
+to pre-existing users, but cannot uninstall pre-existing system packages from pre-existing users.
+
+Full documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
+-->
+
+<config>
+
+    <!-- qcrilOemHook -->
+
+    <install-in-user-type package="com.qualcomm.qcrilmsgtunnel">
+        <install-in user-type="SYSTEM" />
+        <install-in user-type="FULL" />
+    </install-in-user-type>
+
+    <!-- telephony-apps -->
+
+    <install-in-user-type package="com.qti.telephonysettings">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qualcomm.atfwd">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qualcomm.qti.callfeaturessetting">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qualcomm.qti.confdialer">
+        <install-in user-type="SYSTEM" />
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qti.qualcomm.datastatusnotification">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qti.qualcomm.deviceinfo">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="org.codeaurora.ims">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="org.codeaurora.qti.nrNetworkSettingApp">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qualcomm.qti.telephonyservice">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qualcomm.qti.sam.service">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qti.xdivert">
+        <install-in user-type="SYSTEM" />
+        <install-in user-type="FULL" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qti.phone">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <!-- telephony-internal -->
+
+    <install-in-user-type package="com.qualcomm.qti.imsiprivacy.tests">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <!-- telephony-noship -->
+
+    <install-in-user-type package="com.qualcomm.qti.devicestatisticsservice">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qualcomm.embms">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qualcomm.qti.euiccresource">
+        <install-in user-type="SYSTEM" />
+        <install-in user-type="FULL" />
+    </install-in-user-type>
+
+ </config>

proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<!--
+/* Copyright (c) 2017-2018, 2020 The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials provided
+ *       with the distribution.
+ *     * Neither the name of The Linux Foundation nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-->
+
+<config>
+    <!-- Broadcast actions that are currently whitelisted. -->
+    <allow-implicit-broadcast action="org.codeaurora.intent.action.PRE_ALERTING_CALL_INFO" />
+    <!-- These are location components that need to freely run in the background -->
+    <allow-in-power-save package="com.qualcomm.location" />
+    <hidden-api-whitelisted-app package="com.qualcomm.location" />
+    <hidden-api-whitelisted-app package="com.skyhook.blp" />
+</config>