AndroidProducts.mk

@@ -1,6 +1,17 @@
 #
-# SPDX-FileCopyrightText: 2022 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2022 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.
 #
 
 PRODUCT_MAKEFILES := \

BoardConfig.mk

@@ -1,6 +1,17 @@
 #
-# SPDX-FileCopyrightText: 2022-2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2022 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.
 #
 
 DEVICE_PATH := device/motorola/berlin
@@ -12,7 +23,7 @@ include device/motorola/sm7325-common/BoardConfigCommon.mk
 TARGET_BOOTLOADER_BOARD_NAME := berlin
 
 # HIDL
-DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
+DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest_berlin.xml
 
 # Kernel
 BOARD_KERNEL_CMDLINE += androidboot.hab.product=berlin
@@ -39,13 +50,8 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
 # Recovery
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90
 
-# Security patch level
-BOOT_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH)
-VENDOR_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH)
-
-# Verified Boot
-BOARD_AVB_ROLLBACK_INDEX := 38
-BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := 38
+# Security
+VENDOR_SECURITY_PATCH := 2024-09-01
 
 # inherit from the proprietary version
 include vendor/motorola/berlin/BoardConfigVendor.mk

device.mk

@@ -1,6 +1,17 @@
 #
-# SPDX-FileCopyrightText: 2022-2025 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2022 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.
 #
 
 # Boot animation
@@ -25,8 +36,7 @@ PRODUCT_PACKAGES += \
     FrameworksResBerlin \
     LineageSystemUIBerlin \
     SettingsProviderResBerlin \
-    SystemUIResBerlin \
-    WifiResBerlin
+    SystemUIResBerlin
 
 # Audio
 PRODUCT_COPY_FILES += \
@@ -38,9 +48,14 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
     $(LOCAL_PATH)/audio/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml
 
+# Camera
+PRODUCT_PACKAGES += \
+    libgui_shim_vendor
+
 # Fingerprint
 PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service.berlin
+    android.hardware.biometrics.fingerprint@2.1-service.berlin \
+    com.motorola.hardware.biometric.fingerprint@1.0.vendor
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/idc/uinput_nav.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput_nav.idc \
@@ -60,9 +75,13 @@ PRODUCT_PACKAGES += \
 
 # NFC
 PRODUCT_PACKAGES += \
+    android.hardware.nfc@1.2.vendor \
     android.hardware.nfc@1.2-service.st \
+    android.hardware.secure_element@1.2.vendor \
     com.android.nfc_extras \
-    Tag
+    libchrome.vendor \
+    Tag \
+    nfc_nci.st21nfc.default
 
 # Permissions
 PRODUCT_COPY_FILES += \

fingerprint/Android.bp

@@ -1,7 +1,17 @@
 //
-// SPDX-FileCopyrightText: 2022-2024 The LineageOS Project
-// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2017-2018 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.
 cc_binary {
     name: "android.hardware.biometrics.fingerprint@2.1-service.berlin",
     vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.berlin.xml"],

fingerprint/BiometricsFingerprint.cpp

@@ -1,7 +1,18 @@
 /*
- * SPDX-FileCopyrightText: 2018-2020 The Android Open Source Project
- * SPDX-FileCopyrightText: 2020-2024 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
+ * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2018-2020 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 "android.hardware.biometrics.fingerprint@2.1-service.berlin"

fingerprint/BiometricsFingerprint.h

@@ -1,8 +1,18 @@
 /*
- * SPDX-FileCopyrightText: 2022-2024 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
+ * Copyright (C) 2017 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.
  */
-
 #ifndef ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H
 
 #define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H

fingerprint/service.cpp

@@ -1,6 +1,17 @@
 /*
- * SPDX-FileCopyrightText: 2018 The Android Open Source Project
- * SPDX-License-Identifier: Apache-2.0
+ * Copyright (C) 2017 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.
  */
 
 #define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.berlin"

lineage.dependencies

@@ -0,0 +1,6 @@
+[
+  {
+    "repository": "android_device_motorola_sm7325-common",
+    "target_path": "device/motorola/sm7325-common"
+  }
+]

lineage_berlin.mk

@@ -1,6 +1,17 @@
 #
-# SPDX-FileCopyrightText: 2022-2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2022 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.
 #
 
 # Inherit from those products. Most specific first.
@@ -8,31 +19,20 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 TARGET_SUPPORTS_OMX_SERVICE := false
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
-# Inherit from berlin device.
+# Inherit from berlin device
 $(call inherit-product, device/motorola/berlin/device.mk)
 
-# Inherit some common LineageOS / Evolution-X stuff.
+# Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
-EVO_BUILD_TYPE := MINKAN
 
-# Targets
-TARGET_SUPPORT_BOOT_ANIMATIONS := true
-TARGET_SUPPORTS_64_BIT_APPS := true
-TARGET_BUILD_DEVICE_AS_WEBCAM := true
-TARGET_USES_BLUR_RECENT := true
-
-# Device identifier.
 PRODUCT_NAME := lineage_berlin
 PRODUCT_DEVICE := berlin
 PRODUCT_MANUFACTURER := motorola
 PRODUCT_BRAND := motorola
 PRODUCT_MODEL := motorola edge 20
 
-# GMS
-WITH_GMS := true
 PRODUCT_GMS_CLIENTID_BASE := android-motorola
 
-# Properties
 PRODUCT_BUILD_PROP_OVERRIDES += \
     BuildDesc="berlin_global-user 13 T1RGS33.135-109-9-29 695e0-d4b251 release-keys" \
     BuildFingerprint=motorola/berlin_global/berlin:13/T1RGS33.135-109-9-29/695e0-d4b251:user/release-keys \

manifest_berlin.xml

@@ -1,8 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
 <manifest version="2.0" type="device">
 	<hal format="hidl">
         <name>vendor.lineage.livedisplay</name>

resource-overlay/berlin/Frameworks/Android.bp

@@ -0,0 +1,5 @@
+runtime_resource_overlay {
+    name: "FrameworksResBerlin",
+    sdk_version: "current",
+    vendor: true
+}

resource-overlay/berlin/Frameworks/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
+     Copyright (C) 2022 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"

resource-overlay/berlin/Frameworks/res/values/config.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022-2024 The LineageOS Project
+     Copyright (C) 2022 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>

resource-overlay/berlin/Frameworks/res/xml/power_profile.xml

@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The Linux Foundation
-     SPDX-License-Identifier: BSD-3-Clause
--->
 <device name="Android">
     <item name="none">0</item>
     <item name="screen.on">139.28</item>

resource-overlay/berlin/LineageSystemUI/Android.bp

@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2022 The LineageOS Project
+// Copyright (C) 2022 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 

resource-overlay/berlin/LineageSystemUI/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
+     Copyright (C) 2022 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"

resource-overlay/berlin/LineageSystemUI/res/values/config.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
+     Copyright (C) 2022 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>

resource-overlay/berlin/SettingsProvider/Android.bp

@@ -0,0 +1,5 @@
+runtime_resource_overlay {
+    name: "SettingsProviderResBerlin",
+    sdk_version: "current",
+    vendor: true
+}

resource-overlay/berlin/SettingsProvider/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
+     Copyright (C) 2022 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"

resource-overlay/berlin/SettingsProvider/res/values/config.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
+     Copyright (C) 2022 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
     <!-- Default for Settings.Global.DEVICE_NAME $1=MODEL-->
-    <string name="def_device_name_simple">moto edge 20</string>
+    <string name="def_device_name_simple">Motorola Edge 20</string>
 </resources>

resource-overlay/berlin/SystemUI/Android.bp

@@ -0,0 +1,5 @@
+runtime_resource_overlay {
+    name: "SystemUIResBerlin",
+    sdk_version: "current",
+    vendor: true
+}

resource-overlay/berlin/SystemUI/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
+     Copyright (C) 2022 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"

resource-overlay/berlin/SystemUI/res/values/integers.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
+     Copyright (C) 2022 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>

resource-overlay/device/Frameworks/Android.bp

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

resource-overlay/device/SettingsProvider/Android.bp

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

resource-overlay/device/SystemUI/Android.bp

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

resource-overlay/device/Wifi/Android.bp

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

resource-overlay/device/Wifi/AndroidManifest.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2021-2025 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.wifi.resources.overlay.berlin">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="750"
-        android:targetName="WifiCustomization"
-        android:targetPackage="com.android.wifi.resources" />
-</manifest>

resource-overlay/device/Wifi/res/values/config.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2021-2025 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<resources>
-
-    <!-- Default access point SSID used for tethering -->
-    <string name="wifi_tether_configure_ssid_default" translatable="false">moto edge 20</string>
-
-</resources>

touch/Android.bp

@@ -1,7 +1,17 @@
 //
-// SPDX-FileCopyrightText: 2022 The LineageOS Project
-// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2020 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.
 
 cc_binary {
     name: "vendor.lineage.touch@1.0-service.berlin",

touch/HighTouchPollingRate.cpp

@@ -1,6 +1,17 @@
 /*
- * SPDX-FileCopyrightText: 2022-2024 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
+ * Copyright (C) 2020 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 "HighTouchPollingRateService"

touch/HighTouchPollingRate.h

@@ -1,6 +1,17 @@
 /*
- * SPDX-FileCopyrightText: 2022-2024 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
+ * Copyright (C) 2020 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.
  */
 
 #pragma once

touch/service.cpp

@@ -1,6 +1,17 @@
 /*
- * SPDX-FileCopyrightText: 2022-2024 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
+ * Copyright (C) 2020 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 "lineage.touch@1.0-service.berlin"

vendor.prop

@@ -7,7 +7,7 @@ persist.vendor.audio_fx.waves.processing_nx=true
 persist.vendor.audio_fx.waves.systrace=true
 
 # Bluetooth
-bluetooth.device.default_name=moto edge 20
+bluetooth.device.default_name=Motorola Edge 20
 
 # Camera
 persist.vendor.camera.physical.num=4