FP5: Initial rebrand to otter
Change-Id: I7eddb193a1ad5230236f6f346ec2794495ee591c
diff --git a/Android.mk b/Android.mk
index 6f97da9..2b23a74 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,7 +5,7 @@
LOCAL_PATH := $(call my-dir)
-ifeq ($(TARGET_DEVICE),FP5)
+ifeq ($(TARGET_DEVICE),otter)
include $(call all-makefiles-under,$(LOCAL_PATH))
include $(CLEAR_VARS)
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 89d1729..558ffd8 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -4,4 +4,4 @@
#
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/lineage_FP5.mk
+ $(LOCAL_DIR)/lineage_otter.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 908b4a4..6e9355b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
#
-DEVICE_PATH := device/fairphone/FP5
+DEVICE_PATH := device/shift/otter
# A/B
AB_OTA_UPDATER := true
@@ -47,7 +47,7 @@
BOARD_USES_ALSA_AUDIO := true
# Bootloader
-TARGET_BOOTLOADER_BOARD_NAME := FP5
+TARGET_BOOTLOADER_BOARD_NAME := otter
# Camera
TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED := true
@@ -100,7 +100,7 @@
BOARD_KERNEL_SEPARATED_DTBO := true
TARGET_KERNEL_CONFIG := vendor/fp5-qgki_defconfig vendor/debugfs.config vendor/fp5.config
TARGET_KERNEL_NO_GCC := true
-TARGET_KERNEL_SOURCE := kernel/fairphone/qcm6490
+TARGET_KERNEL_SOURCE := kernel/shift/qcm6490
# Kernel modules
BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist
@@ -192,4 +192,4 @@
WPA_SUPPLICANT_VERSION := VER_0_8_X
# Inherit the proprietary files
-include vendor/fairphone/FP5/BoardConfigVendor.mk
+include vendor/shift/otter/BoardConfigVendor.mk
diff --git a/README.md b/README.md
index 6c93157..188525b 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,21 @@
## Device Picture
-
+
## Device Specifications
-| Device | Fairphone 5 |
+| Device | SHIFTphone 8 |
| -----------------------: | :---------------------------------------------- |
| SoC | Qualcomm QCM6490 (SM7325) |
| QCOM Board Platform | lahaina |
| CPU | (1) x 2.7 GHz Kryo 670 Gold Plus, (3) x 2.4 GHz Kryo 670 Gold, (4) x 1.9 GHz Kryo 670 Silver |
| GPU | Adreno 643 |
-| Memory | 8GB RAM |
-| Shipping Android version | 13 |
-| Storage | 256GB |
-| Battery | Removable Li-Ion 4200 mAh |
-| Dimensions | 161.6 x 75.83 x 9.6 mm |
-| Display | 2770 x 1224 (20:9), 6.46 inch |
-| Rear camera 1 | 50MP, f/1.88 (Wide) Dual LED flash |
-| Rear camera 2 | 50MP, f/2.2 (Ultra Wide) |
-| Rear camera 3 | TOF 3D (Depth) |
-| Front camera | 50MP, f/2.45 (Wide) |
+| Memory | 12GB RAM |
+| Shipping Android version | 14 |
+| Storage | 256GB/512GB |
+| Battery | Removable Li-Ion 3850 mAh |
+| Dimensions | 164.2 x 78.7 x 9.8 mm |
+| Display | 2400 x 1080 (20:9), 6.67 inch |
+| Rear camera 1 | 50MP, f/1.8 (Wide) Dual LED flash |
+| Rear camera 2 | 50MP, (Ultra Wide) |
+| Front camera | 32MP, (Wide) |
| Network | GSM / HSPA / LTE / 5G |
diff --git a/bootctrl/Android.bp b/bootctrl/Android.bp
index fe842b6..57a23ac 100644
--- a/bootctrl/Android.bp
+++ b/bootctrl/Android.bp
@@ -7,5 +7,5 @@
name: "android.hardware.boot@1.1-impl-qti",
stem: "android.hardware.boot@1.0-impl-1.1-qti",
defaults: ["android.hardware.boot@1.1-impl-qti_defaults"],
- static_libs: ["libgptutils.fairphone_lahaina"],
+ static_libs: ["libgptutils.otter"],
}
diff --git a/device.mk b/device.mk
index 2997217..01c5bfd 100644
--- a/device.mk
+++ b/device.mk
@@ -361,7 +361,7 @@
# Vibrator
PRODUCT_PACKAGES += \
- vendor.qti.hardware.vibrator.service.FP5
+ vendor.qti.hardware.vibrator.service.otter
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/vibrator/excluded-input-devices.xml:$(TARGET_COPY_OUT_VENDOR)/etc/excluded-input-devices.xml
@@ -396,4 +396,4 @@
WfdCommon
# Inherit from the proprietary files makefile.
-$(call inherit-product, vendor/fairphone/FP5/FP5-vendor.mk)
+$(call inherit-product, vendor/shift/otter/otter-vendor.mk)
diff --git a/extract-files.sh b/extract-files.sh
index dc01b8b..d117c9c 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -7,8 +7,8 @@
set -e
-DEVICE=FP5
-VENDOR=fairphone
+DEVICE=otter
+VENDOR=shift
# Load extract_utils and do some sanity checks
MY_DIR="${BASH_SOURCE%/*}"
diff --git a/gpt-utils/Android.bp b/gpt-utils/Android.bp
index e642d2c..83af78d 100644
--- a/gpt-utils/Android.bp
+++ b/gpt-utils/Android.bp
@@ -4,7 +4,7 @@
//
cc_library {
- name: "libgptutils.fairphone_lahaina",
+ name: "libgptutils.otter",
vendor: true,
recovery_available: true,
shared_libs: [
diff --git a/lineage.dependencies b/lineage.dependencies
index 638ab62..c46ced4 100644
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -1,6 +1,6 @@
[
{
- "repository": "android_kernel_fairphone_qcm6490",
- "target_path": "kernel/fairphone/qcm6490"
+ "repository": "android_kernel_shift_qcm6490",
+ "target_path": "kernel/shift/qcm6490"
}
]
diff --git a/lineage_FP5.mk b/lineage_otter.mk
similarity index 62%
rename from lineage_FP5.mk
rename to lineage_otter.mk
index e8474de..c9335f4 100644
--- a/lineage_FP5.mk
+++ b/lineage_otter.mk
@@ -7,8 +7,8 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
-# Inherit from FP5 device
-$(call inherit-product, device/fairphone/FP5/device.mk)
+# Inherit from otter device
+$(call inherit-product, device/shift/otter/device.mk)
# Inherit some common Lineage stuff.
$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
@@ -18,17 +18,17 @@
TARGET_SCREEN_WIDTH := 1224
# Device identifier. This must come after all inclusions.
-PRODUCT_NAME := lineage_FP5
-PRODUCT_DEVICE := FP5
-PRODUCT_BRAND := Fairphone
-PRODUCT_MODEL := FP5
-PRODUCT_MANUFACTURER := Fairphone
+PRODUCT_NAME := lineage_otter
+PRODUCT_DEVICE := otter
+PRODUCT_BRAND := SHIFT
+PRODUCT_MODEL := SHIFTphone 8
+PRODUCT_MANUFACTURER := SHIFT
-PRODUCT_SYSTEM_NAME := FP5
+PRODUCT_SYSTEM_NAME := otter
-PRODUCT_GMS_CLIENTID_BASE := android-alcatel
+PRODUCT_GMS_CLIENTID_BASE := android-uniscope
PRODUCT_BUILD_PROP_OVERRIDES += \
TARGET_PRODUCT=$(PRODUCT_SYSTEM_NAME)
-BUILD_FINGERPRINT := Fairphone/FP5/FP5:14/UKQ1.230924.001/UT20:user/release-keys
+BUILD_FINGERPRINT := SHIFT/otter/otter:14/SOS.6.0/20240916:user/release-keys
diff --git a/overlay/SettingsProviderResCommon/res/values/defaults.xml b/overlay/SettingsProviderResCommon/res/values/defaults.xml
index 260fff3..7e73852 100644
--- a/overlay/SettingsProviderResCommon/res/values/defaults.xml
+++ b/overlay/SettingsProviderResCommon/res/values/defaults.xml
@@ -8,5 +8,5 @@
<bool name="def_screen_brightness_automatic_mode">true</bool>
<!-- Default for Settings.Global.DEVICE_NAME $1=MODEL-->
- <string name="def_device_name_simple" translatable="false">Fairphone 5 5G</string>
+ <string name="def_device_name_simple" translatable="false">SHIFTphone 8</string>
</resources>
diff --git a/overlay/WifiResCommon/res/values/config.xml b/overlay/WifiResCommon/res/values/config.xml
index bc6ecff..12b9a37 100644
--- a/overlay/WifiResCommon/res/values/config.xml
+++ b/overlay/WifiResCommon/res/values/config.xml
@@ -67,5 +67,5 @@
<string name="config_wifiSoftap2gChannelList" translatable="false" />
<!-- Do not translate. Default access point SSID used for tethering -->
- <string name="wifi_tether_configure_ssid_default" translatable="false">Fairphone 5 5G</string>
+ <string name="wifi_tether_configure_ssid_default" translatable="false">SHIFTphone 8</string>
</resources>
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index f3504dd..77cd5c7 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -37,4 +37,4 @@
/vendor/bin/tctd u:object_r:tctd_exec:s0
# Vibrator
-/vendor/bin/hw/vendor\.qti\.hardware\.vibrator\.service\.FP5 u:object_r:hal_vibrator_default_exec:s0
+/vendor/bin/hw/vendor\.qti\.hardware\.vibrator\.service\.otter u:object_r:hal_vibrator_default_exec:s0
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 8c697b4..1ea3f00 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -7,8 +7,8 @@
set -e
-DEVICE=FP5
-VENDOR=fairphone
+DEVICE=otter
+VENDOR=shift
# Load extract_utils and do some sanity checks
MY_DIR="${BASH_SOURCE%/*}"
@@ -27,7 +27,7 @@
function vendor_imports() {
cat <<EOF >>"$1"
- "device/fairphone/FP5",
+ "device/shift/otter",
"hardware/qcom-caf/sm8350",
"hardware/qcom-caf/wlan",
"vendor/qcom/opensource/commonsys/display",
diff --git a/vendor.prop b/vendor.prop
index bb94660..0c82602 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -59,7 +59,7 @@
# Bluetooth
bluetooth.device.class_of_device=90,2,12
-bluetooth.device.default_name=Fairphone 5 5G
+bluetooth.device.default_name=SHIFTphone 8
bluetooth.hardware.power.idle_cur_ma=6
bluetooth.hardware.power.operating_voltage_mv=3700
bluetooth.hardware.power.rx_cur_ma=28
@@ -184,7 +184,7 @@
sys.usb.mtp.batchcancel=1
vendor.usb.diag.func.name=ffs
vendor.usb.dpl.inst.name=dpl
-vendor.usb.product_string=Fairphone 5 5G
+vendor.usb.product_string=SHIFTphone 8
vendor.usb.qdss.inst.name=qdss_mdm
vendor.usb.rmnet.func.name=gsi
vendor.usb.rmnet.inst.name=rmnet
diff --git a/vibrator/Android.bp b/vibrator/Android.bp
index 1d6508a..83a93c0 100644
--- a/vibrator/Android.bp
+++ b/vibrator/Android.bp
@@ -34,7 +34,7 @@
cc_library_shared {
- name: "vendor.qti.hardware.vibrator.impl.FP5",
+ name: "vendor.qti.hardware.vibrator.impl.otter",
defaults: ["vibrator_defaults"],
vendor: true,
srcs: [
@@ -53,13 +53,13 @@
}
cc_binary {
- name: "vendor.qti.hardware.vibrator.service.FP5",
+ name: "vendor.qti.hardware.vibrator.service.otter",
defaults: ["vibrator_defaults"],
vendor: true,
relative_install_path: "hw",
- init_rc: ["vendor.qti.hardware.vibrator.service.FP5.rc"],
+ init_rc: ["vendor.qti.hardware.vibrator.service.otter.rc"],
vintf_fragments: [
- "vendor.qti.hardware.vibrator.service.FP5.xml",
+ "vendor.qti.hardware.vibrator.service.otter.xml",
],
srcs: [
"service.cpp",
@@ -69,6 +69,6 @@
"libutils",
"libbase",
"libbinder_ndk",
- "vendor.qti.hardware.vibrator.impl.FP5",
+ "vendor.qti.hardware.vibrator.impl.otter",
],
}
diff --git a/vibrator/Vibrator.cpp b/vibrator/Vibrator.cpp
index 067b717..bea4b44 100644
--- a/vibrator/Vibrator.cpp
+++ b/vibrator/Vibrator.cpp
@@ -32,7 +32,7 @@
* SPDX-License-Identifier: BSD-3-Clause-Clear
*/
-#define LOG_TAG "vendor.qti.vibrator.FP5"
+#define LOG_TAG "vendor.qti.vibrator.otter"
#include <cutils/properties.h>
#include <dirent.h>
diff --git a/vibrator/service.cpp b/vibrator/service.cpp
index 6440b39..aa8125b 100644
--- a/vibrator/service.cpp
+++ b/vibrator/service.cpp
@@ -27,7 +27,7 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define LOG_TAG "vendor.qti.hardware.vibrator.service.FP5"
+#define LOG_TAG "vendor.qti.hardware.vibrator.service.otter"
#include <android-base/logging.h>
#include <android/binder_manager.h>
diff --git a/vibrator/vendor.qti.hardware.vibrator.service.FP5.rc b/vibrator/vendor.qti.hardware.vibrator.service.otter.rc
similarity index 93%
rename from vibrator/vendor.qti.hardware.vibrator.service.FP5.rc
rename to vibrator/vendor.qti.hardware.vibrator.service.otter.rc
index 3644b42..3c78b0b 100644
--- a/vibrator/vendor.qti.hardware.vibrator.service.FP5.rc
+++ b/vibrator/vendor.qti.hardware.vibrator.service.otter.rc
@@ -2,7 +2,7 @@
chown system system /sys/class/qcom-haptics/primitive_duration
chmod 0600 /sys/class/qcom-haptics/primitive_duration
-service vendor.qti.vibrator /vendor/bin/hw/vendor.qti.hardware.vibrator.service.FP5
+service vendor.qti.vibrator /vendor/bin/hw/vendor.qti.hardware.vibrator.service.otter
class hal
user system
group system input
diff --git a/vibrator/vendor.qti.hardware.vibrator.service.FP5.xml b/vibrator/vendor.qti.hardware.vibrator.service.otter.xml
similarity index 100%
rename from vibrator/vendor.qti.hardware.vibrator.service.FP5.xml
rename to vibrator/vendor.qti.hardware.vibrator.service.otter.xml