f62: Adapt from beyond0lte
Change-Id: I7b0d8848c15fd9de151f28804750a1e23cd579c1
diff --git a/Android.mk b/Android.mk
index e143fe0..ea85f38 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2021 The LineageOS Project
+# Copyright (C) 2021-2023 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.
@@ -16,6 +16,6 @@
LOCAL_PATH := $(call my-dir)
-ifneq ($(filter beyond0lte, $(TARGET_DEVICE)),)
+ifneq ($(filter f62, $(TARGET_DEVICE)),)
include $(call all-subdir-makefiles,$(LOCAL_PATH))
endif
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 6595e8a..d49ddc5 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2021 The LineageOS Project
+# Copyright (C) 2021-2023 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.
@@ -15,9 +15,9 @@
#
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/lineage_beyond0lte.mk
+ $(LOCAL_DIR)/lineage_f62.mk
COMMON_LUNCH_CHOICES := \
- lineage_beyond0lte-eng \
- lineage_beyond0lte-user \
- lineage_beyond0lte-userdebug
+ lineage_f62-eng \
+ lineage_f62-user \
+ lineage_f62-userdebug
diff --git a/BoardConfig.mk b/BoardConfig.mk
index d336c03..38417d6 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2021 The LineageOS Project
+# Copyright (C) 2021-2023 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.
@@ -14,24 +14,24 @@
# limitations under the License.
## Inherit from the common tree
-include device/samsung/exynos9820-common/BoardConfigCommon.mk
+include device/samsung/exynos9820-common/BoardConfig9825-r.mk
## Inherit from the proprietary configuration
-include vendor/samsung/beyond0lte/BoardConfigVendor.mk
+include vendor/samsung/f62/BoardConfigVendor.mk
-DEVICE_PATH := device/samsung/beyond0lte
+DEVICE_PATH := device/samsung/f62
## APEX image
DEXPREOPT_GENERATE_APEX_IMAGE := true
## Display
-TARGET_SCREEN_DENSITY := 480
+TARGET_SCREEN_DENSITY := 450
## Fingerprint
TARGET_SEC_FP_HAS_FINGERPRINT_GESTURES := true
## Kernel
-TARGET_KERNEL_CONFIG := exynos9820-beyond0lte_defconfig
+TARGET_KERNEL_CONFIG := exynos9820-f62_defconfig
## Properties
TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
diff --git a/device.mk b/device.mk
index 25b8528..4ad611e 100644
--- a/device.mk
+++ b/device.mk
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2021 The LineageOS Project
+# Copyright (C) 2021-2023 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.
@@ -15,10 +15,10 @@
#
# Inherit from the common tree
-$(call inherit-product, device/samsung/exynos9820-common/common.mk)
+$(call inherit-product, device/samsung/exynos9820-common/exynos9825-r.mk)
# Inherit proprietary files
-$(call inherit-product, vendor/samsung/beyond0lte/beyond0lte-vendor.mk)
+$(call inherit-product, vendor/samsung/f62/f62-vendor.mk)
# Setup dalvik vm configs
$(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)
diff --git a/extract-files.sh b/extract-files.sh
index b8a0ae9..7f3efb5 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -35,7 +35,7 @@
set -e
-export DEVICE=beyond0lte
+export DEVICE=f62
export DEVICE_COMMON=exynos9820-common
export VENDOR=samsung
diff --git a/lineage_beyond0lte.mk b/lineage_f62.mk
similarity index 77%
rename from lineage_beyond0lte.mk
rename to lineage_f62.mk
index 849cf80..d7b5c97 100644
--- a/lineage_beyond0lte.mk
+++ b/lineage_f62.mk
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2021 The LineageOS Project
+# Copyright (C) 2021-2023 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.
@@ -19,15 +19,12 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk)
-## Product API level
-$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_p.mk)
-
-## Inherit from beyond0lte device
-$(call inherit-product, device/samsung/beyond0lte/device.mk)
+## Inherit from f62 device
+$(call inherit-product, device/samsung/f62/device.mk)
## Boot Animation
TARGET_BOOTANIMATION_HALF_RES := true
-TARGET_SCREEN_HEIGHT := 2280
+TARGET_SCREEN_HEIGHT := 2400
TARGET_SCREEN_WIDTH := 1080
## Inherit some common Lineage stuff
@@ -37,10 +34,11 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
## Device identifier, this must come after all inclusions
-PRODUCT_NAME := lineage_beyond0lte
-PRODUCT_DEVICE := beyond0lte
+PRODUCT_NAME := lineage_f62
+PRODUCT_DEVICE := f62
PRODUCT_BRAND := samsung
-PRODUCT_MODEL := SM-G970F
+PRODUCT_MODEL := SM-E625F
PRODUCT_MANUFACTURER := samsung
+PRODUCT_SHIPPING_API_LEVEL := 30
PRODUCT_GMS_CLIENTID_BASE := android-samsung
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 51d84c1..6987dda 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -41,7 +41,7 @@
@see https://www.w3.org/TR/SVG/paths.html#PathData
-->
- <string translatable="false" name="config_mainBuiltInDisplayCutout">M 0,0 H -149 V 116 H 0 V 0 Z @right</string>
+ <string translatable="false" name="config_mainBuiltInDisplayCutout">M 0,0 H -62 V 92 H 62 V 0 H 0 Z</string>
<!-- Indicates whether device has a power button fingerprint sensor. -->
<bool name="config_is_powerbutton_fps">true</bool>
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 304929b..55e2c6b 100644
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -1,147 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<device name="Android">
<item name="none">0</item>
- <item name="ambient.on.display0">21</item>
- <item name="screen.on.display0">59</item>
- <item name="screen.full.display0">269</item>
- <item name="audio">35</item>
- <item name="video">157</item>
- <item name="camera.flashlight">107</item>
- <item name="camera.avg">417</item>
- <item name="gps.on">31</item>
- <item name="radio.active">171</item>
- <item name="radio.scanning">114</item>
+ <item name="ambient.on">31.29</item>
+ <item name="screen.on">65.1</item>
+ <item name="screen.full">268</item>
+ <item name="audio">14.5</item>
+ <item name="video">25</item>
+ <item name="camera.avg">192.75</item>
+ <item name="camera.flashlight">69.6</item>
+ <item name="radio.active">233</item>
+ <item name="radio.scanning">74.5</item>
<array name="radio.on">
- <value>7.7</value>
- <value>7.7</value>
+ <value>2.57</value>
+ <value>2.57</value>
</array>
+ <item name="modem.controller.sleep">0</item>
<item name="modem.controller.idle">0</item>
<item name="modem.controller.rx">0</item>
<item name="modem.controller.tx">0</item>
<item name="modem.controller.voltage">0</item>
- <array name="cpu.clusters.cores">
- <value>4</value>
- <value>2</value>
- <value>2</value>
- </array>
- <array name="cpu.core_speeds.cluster0">
- <value>1950000</value>
- <value>1846000</value>
- <value>1742000</value>
- <value>1586000</value>
- <value>1456000</value>
- <value>1300000</value>
- <value>1157000</value>
- <value>1053000</value>
- <value>949000</value>
- <value>806000</value>
- <value>650000</value>
- <value>546000</value>
- <value>442000</value>
- </array>
- <array name="cpu.core_power.cluster0">
- <value>109</value>
- <value>99</value>
- <value>90</value>
- <value>71</value>
- <value>62</value>
- <value>57</value>
- <value>49</value>
- <value>46</value>
- <value>43</value>
- <value>39</value>
- <value>35</value>
- <value>34</value>
- <value>32</value>
- </array>
- <array name="cpu.core_speeds.cluster1">
- <value>2314000</value>
- <value>2210000</value>
- <value>2106000</value>
- <value>2002000</value>
- <value>1898000</value>
- <value>1794000</value>
- <value>1690000</value>
- <value>1586000</value>
- <value>1508000</value>
- <value>1404000</value>
- <value>1222000</value>
- <value>1066000</value>
- <value>962000</value>
- <value>845000</value>
- <value>754000</value>
- <value>650000</value>
- <value>507000</value>
- </array>
- <array name="cpu.core_power.cluster1">
- <value>382</value>
- <value>285</value>
- <value>250</value>
- <value>223</value>
- <value>199</value>
- <value>178</value>
- <value>156</value>
- <value>139</value>
- <value>130</value>
- <value>117</value>
- <value>100</value>
- <value>86</value>
- <value>77</value>
- <value>70</value>
- <value>64</value>
- <value>57</value>
- <value>51</value>
- </array>
- <array name="cpu.core_speeds.cluster2">
- <value>2730000</value>
- <value>2600000</value>
- <value>2530000</value>
- <value>2470000</value>
- <value>2340000</value>
- <value>2236000</value>
- <value>2080000</value>
- <value>1976000</value>
- <value>1820000</value>
- <value>1664000</value>
- <value>1560000</value>
- <value>1456000</value>
- <value>1378000</value>
- <value>1248000</value>
- <value>1144000</value>
- <value>1040000</value>
- <value>936000</value>
- <value>819000</value>
- <value>728000</value>
- <value>624000</value>
- <value>520000</value>
- </array>
- <array name="cpu.core_power.cluster2">
- <value>1301</value>
- <value>1208</value>
- <value>1028</value>
- <value>837</value>
- <value>679</value>
- <value>610</value>
- <value>485</value>
- <value>425</value>
- <value>353</value>
- <value>307</value>
- <value>270</value>
- <value>241</value>
- <value>224</value>
- <value>193</value>
- <value>178</value>
- <value>153</value>
- <value>133</value>
- <value>115</value>
- <value>105</value>
- <value>94</value>
- <value>83</value>
- </array>
- <item name="cpu.suspend">4.99</item>
- <item name="cpu.idle">20</item>
- <item name="battery.capacity">3000</item>
- <item name="battery.typical.capacity">3100</item>
<item name="wifi.controller.idle">1</item>
<item name="wifi.controller.rx">65</item>
<item name="wifi.controller.tx">265</item>
@@ -156,19 +33,144 @@
<value>.2</value>
<value>2</value>
</array>
- <item name="bluetooth.controller.idle">0</item>
- <item name="bluetooth.controller.rx">10</item>
- <item name="bluetooth.controller.tx">10</item>
+ <item name="gps.on">31</item>
+ <item name="bluetooth.controller.idle">0.038</item>
+ <item name="bluetooth.controller.rx">17</item>
+ <item name="bluetooth.controller.tx">19</item>
+ <item name="bluetooth.controller.voltage">3500</item>
+ <item name="cpu.suspend">6.17</item>
+ <item name="cpu.idle">26.5</item>
+ <array name="cpu.clusters.cores">
+ <value>4</value>
+ <value>2</value>
+ <value>2</value>
+ </array>
+ <array name="cpu.core_speeds.cluster0">
+ <value>442000</value>
+ <value>546000</value>
+ <value>650000</value>
+ <value>806000</value>
+ <value>949000</value>
+ <value>1053000</value>
+ <value>1157000</value>
+ <value>1300000</value>
+ <value>1456000</value>
+ <value>1586000</value>
+ <value>1742000</value>
+ <value>1846000</value>
+ <value>1950000</value>
+ </array>
+ <array name="cpu.core_power.cluster0">
+ <value>42</value>
+ <value>43</value>
+ <value>45</value>
+ <value>48</value>
+ <value>51</value>
+ <value>54</value>
+ <value>58</value>
+ <value>63</value>
+ <value>69</value>
+ <value>77</value>
+ <value>91</value>
+ <value>102</value>
+ <value>111</value>
+ </array>
+ <array name="cpu.core_speeds.cluster1">
+ <value>507000</value>
+ <value>650000</value>
+ <value>754000</value>
+ <value>845000</value>
+ <value>962000</value>
+ <value>1066000</value>
+ <value>1222000</value>
+ <value>1404000</value>
+ <value>1508000</value>
+ <value>1586000</value>
+ <value>1690000</value>
+ <value>1794000</value>
+ <value>1898000</value>
+ <value>2002000</value>
+ <value>2106000</value>
+ <value>2210000</value>
+ <value>2314000</value>
+ <value>2400000</value>
+ </array>
+ <array name="cpu.core_power.cluster1">
+ <value>59</value>
+ <value>66</value>
+ <value>72</value>
+ <value>77</value>
+ <value>84</value>
+ <value>91</value>
+ <value>104</value>
+ <value>119</value>
+ <value>129</value>
+ <value>139</value>
+ <value>155</value>
+ <value>176</value>
+ <value>196</value>
+ <value>216</value>
+ <value>241</value>
+ <value>283</value>
+ <value>367</value>
+ <value>415</value>
+ </array>
+ <array name="cpu.core_speeds.cluster2">
+ <value>520000</value>
+ <value>624000</value>
+ <value>728000</value>
+ <value>819000</value>
+ <value>936000</value>
+ <value>1040000</value>
+ <value>1144000</value>
+ <value>1248000</value>
+ <value>1378000</value>
+ <value>1456000</value>
+ <value>1560000</value>
+ <value>1664000</value>
+ <value>1820000</value>
+ <value>1976000</value>
+ <value>2080000</value>
+ <value>2236000</value>
+ <value>2340000</value>
+ <value>2470000</value>
+ <value>2530000</value>
+ <value>2600000</value>
+ <value>2730000</value>
+ </array>
+ <array name="cpu.core_power.cluster2">
+ <value>92</value>
+ <value>101</value>
+ <value>112</value>
+ <value>118</value>
+ <value>132</value>
+ <value>155</value>
+ <value>174</value>
+ <value>189</value>
+ <value>213</value>
+ <value>229</value>
+ <value>254</value>
+ <value>288</value>
+ <value>328</value>
+ <value>387</value>
+ <value>443</value>
+ <value>561</value>
+ <value>621</value>
+ <value>752</value>
+ <value>835</value>
+ <value>1001</value>
+ <value>1067</value>
+ </array>
<array name="gpu.active">
- <value>78</value>
- <value>105</value>
- <value>128</value>
- <value>160</value>
- <value>230</value>
- <value>266</value>
- <value>389</value>
- <value>458</value>
- <value>516</value>
+ <value>73</value>
+ <value>95</value>
+ <value>115</value>
+ <value>138</value>
+ <value>205</value>
+ <value>235</value>
+ <value>333</value>
+ <value>408</value>
+ <value>515</value>
</array>
<array name="gpu.speeds">
<value>156000</value>
@@ -179,6 +181,8 @@
<value>433000</value>
<value>572000</value>
<value>650000</value>
- <value>702000</value>
+ <value>754000</value>
</array>
-</device>
+ <item name="battery.capacity">6800</item>
+ <item name="battery.typical.capacity">7000</item>
+</device>
\ No newline at end of file
diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index 0b320fd..a13ae34 100644
--- a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -18,5 +18,5 @@
-->
<resources>
<!-- Default for Settings.Global.DEVICE_NAME $1=MODEL-->
- <string name="def_device_name_simple">Galaxy S10e</string>
+ <string name="def_device_name_simple">Galaxy F62</string>
</resources>
diff --git a/overlay/lineage-sdk/lineage/res/res/values/config.xml b/overlay/lineage-sdk/lineage/res/res/values/config.xml
deleted file mode 100644
index 4f7e80e..0000000
--- a/overlay/lineage-sdk/lineage/res/res/values/config.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019 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.
--->
-<resources>
- <!-- Hardware keys present on the device, stored as a bit field.
- This integer should equal the sum of the corresponding value for each
- of the following keys present:
- 1 - Home
- 2 - Back
- 4 - Menu
- 8 - Assistant (search)
- 16 - App switch
- 32 - Camera
- 64 - Volume rocker
- For example, a device with Home, Back and Menu keys would set this
- config to 7. -->
- <integer name="config_deviceHardwareKeys">68</integer>
-
- <!-- Hardware keys present on the device with the ability to wake, stored as a bit field.
- This integer should equal the sum of the corresponding value for each
- of the following keys present:
- 1 - Home
- 2 - Back
- 4 - Menu
- 8 - Assistant (search)
- 16 - App switch
- 32 - Camera
- 64 - Volume rocker
- For example, a device with Home, Back and Menu keys would set this
- config to 7. -->
- <integer name="config_deviceHardwareWakeKeys">68</integer>
-
- <!-- Control the behavior when the user long presses the menu button.
- 0 - Nothing
- 1 - Menu key
- 2 - Recent apps view in SystemUI
- 3 - Launch assist intent
- 4 - Voice Search
- 5 - In-app Search
- 6 - Launch camera
- 7 - Sleep
- 8 - Last app
- 9 - Toggle split screen
- This needs to match the enums in
- sdk/src/java/org/lineageos/internal/util/DeviceKeysConstants.java.
- -->
- <integer name="config_longPressOnMenuBehavior">3</integer>
-</resources>
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index f8bffa2..7214afe 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -8,7 +8,7 @@
set -e
-export DEVICE=beyond0lte
+export DEVICE=f62
export DEVICE_COMMON=exynos9820-common
export VENDOR=samsung
diff --git a/vendor.prop b/vendor.prop
index faf4ac1..1b04980 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -1,5 +1,5 @@
## Bluetooth
-bluetooth.device.default_name=Galaxy S10e
+bluetooth.device.default_name=Galaxy F62
## RIL
ro.telephony.default_network=9,9