Merge branch 'LineageOS:lineage-23.2' into blissrom-19.5

common.mk

@@ -31,6 +31,7 @@ PRODUCT_PACKAGES += \
     FrameworksResCommon \
     FrameworksResProduct \
     FrameworksResTarget \
+    LineageApertureAppCommon \
     NcmTetheringOverlay \
     SettingsProviderResCommon \
     SystemUIResCommon \

manifest.xml

@@ -3,7 +3,7 @@
      SPDX-FileCopyrightText: The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
-<manifest version="2.0" type="device" target-level="6">
+<manifest version="2.0" type="device" target-level="7">
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>

resource-overlay/common/LineageApertureApp/Android.bp

@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "LineageApertureAppCommon",
+    vendor: true,
+}

resource-overlay/common/LineageApertureApp/AndroidManifest.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.lineageos.aperture.common.lineage">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="200"
+        android:targetPackage="org.lineageos.aperture" />
+</manifest>