Merge "envsetup: Fix bash syntax error" into arcadia-next
diff --git a/build/core/main_version.mk b/build/core/main_version.mk
index 1ab209c..eb46ed6 100644
--- a/build/core/main_version.mk
+++ b/build/core/main_version.mk
@@ -13,4 +13,5 @@
ro.bliss.static.version=$(BLISS_VERSION_STATIC) \
ro.bliss.build.variant=$(BLISS_BUILD_VARIANT) \
ro.bliss.build.timestamp=$(BLISS_BUILD_TIMESTAMP) \
- ro.bliss.build=$(BLISS_BUILD_ZIP)
+ ro.bliss.build=$(BLISS_BUILD_ZIP) \
+ ro.bliss.security_patch_level=$(BLISS_SECURITY_PATCH)
diff --git a/build/core/vendor/qcom_boards.mk b/build/core/vendor/qcom_boards.mk
index 19d3744..f67091a 100644
--- a/build/core/vendor/qcom_boards.mk
+++ b/build/core/vendor/qcom_boards.mk
@@ -10,6 +10,7 @@
TRINKET := trinket #SM6125
ATOLL := atoll #SM6250
LAHAINA ?= lahaina #SM8350
+HOLI ?= holi #SM4350
# A Family
QCOM_BOARD_PLATFORMS += msm7x27a
@@ -54,3 +55,4 @@
QCOM_BOARD_PLATFORMS += $(MSMNILE)
QCOM_BOARD_PLATFORMS += $(ATOLL)
QCOM_BOARD_PLATFORMS += $(LAHAINA)
+QCOM_BOARD_PLATFORMS += $(HOLI)
diff --git a/build/envsetup.sh b/build/envsetup.sh
index 153f541..2f64554 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -18,6 +18,7 @@
- repolastsync: Prints date and time of last repo sync.
- reposync: Parallel repo sync using ionice and SCHED_BATCH.
- repopick: Utility to fetch changes from Gerrit.
+- sort-blobs-list: Sort proprietary-files.txt sections with LC_ALL=C.
- installboot: Installs a boot.img to the connected device.
- installrecovery: Installs a recovery.img to the connected device.
- blissify: Sets up build environment using breakfast(),
@@ -931,6 +932,11 @@
$T/vendor/bliss/build/tools/repopick.py $@
}
+function sort-blobs-list() {
+ T=$(gettop)
+ $T/tools/extract-utils/sort-blobs-list.py $@
+}
+
function fixup_common_out_dir() {
common_out_dir=$(get_build_var OUT_DIR)/target/common
target_device=$(get_build_var TARGET_DEVICE)
@@ -1090,3 +1096,7 @@
fi
return $?
}
+
+# Override host metadata to make builds more reproducible and avoid leaking info
+export BUILD_USERNAME=nobody
+export BUILD_HOSTNAME=android-build
diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
index a5b4d0b..18d6998 100644
--- a/config/BoardConfigQcom.mk
+++ b/config/BoardConfigQcom.mk
@@ -7,6 +7,7 @@
TRINKET := trinket #SM6125
ATOLL := atoll #SM6250
LAHAINA ?= lahaina #SM8350
+HOLI ?= holi #SM4350
B_FAMILY := msm8226 msm8610 msm8974
B64_FAMILY := msm8992 msm8994
@@ -16,7 +17,7 @@
UM_4_9_FAMILY := sdm845 sdm710
UM_4_14_FAMILY := $(MSMNILE) $(MSMSTEPPE) $(TRINKET) $(ATOLL)
UM_4_19_FAMILY := $(KONA) $(LITO) $(BENGAL)
-UM_5_4_FAMILY := $(LAHAINA)
+UM_5_4_FAMILY := $(LAHAINA) $(HOLI)
UM_PLATFORMS := $(UM_3_18_FAMILY) $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY)
QSSI_SUPPORTED_PLATFORMS := $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY)
@@ -103,7 +104,7 @@
endif
# List of targets that use master side content protection
-MASTER_SIDE_CP_TARGET_LIST := msm8996 $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY)
+MASTER_SIDE_CP_TARGET_LIST := msm8996 $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY)
ifneq ($(filter $(B_FAMILY),$(TARGET_BOARD_PLATFORM)),)
MSM_VIDC_TARGET_LIST := $(B_FAMILY)
@@ -130,7 +131,6 @@
MSM_VIDC_TARGET_LIST := $(UM_4_19_FAMILY)
QCOM_HARDWARE_VARIANT := sm8250
else ifneq ($(filter $(UM_5_4_FAMILY),$(TARGET_BOARD_PLATFORM)),)
- MSM_VIDC_TARGET_LIST := $(UM_5_4_FAMILY)
QCOM_HARDWARE_VARIANT := sm8350
else
MSM_VIDC_TARGET_LIST := $(TARGET_BOARD_PLATFORM)
diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index 7a901a6..885b91f 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -31,8 +31,7 @@
WallpaperPicker2 \
OmniStyle \
AboutBliss \
- SoftAPManager \
- GamingMode \
+ GameSpace \
OmniJaws
# Config
diff --git a/config/common.mk b/config/common.mk
index 9e3e3d4..d1e17ea 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -57,6 +57,7 @@
PRODUCT_COPY_FILES += \
vendor/bliss/prebuilt/common/etc/init/init.bliss-system_ext.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.bliss-system_ext.rc \
vendor/bliss/prebuilt/common/etc/init/init.bliss-updater.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.bliss-updater.rc \
+ vendor/bliss/prebuilt/common/etc/init/smartcharge-init.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/smartcharge-init.rc \
vendor/bliss/prebuilt/common/etc/init/init.openssh.rc:$(TARGET_COPY_OUT_PRODUCT)/etc/init/init.openssh.rc
# Enable Android Beam on all targets
diff --git a/config/permissions/privapp-permissions-bliss-system_ext.xml b/config/permissions/privapp-permissions-bliss-system_ext.xml
index b66afee..d8750d8 100644
--- a/config/permissions/privapp-permissions-bliss-system_ext.xml
+++ b/config/permissions/privapp-permissions-bliss-system_ext.xml
@@ -65,6 +65,7 @@
<permission name="android.permission.WRITE_APN_SETTINGS"/>
<permission name="android.permission.WRITE_MEDIA_STORAGE"/>
<permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+ <permission name="lineageos.permission.MANAGE_LIVEDISPLAY" />
</privapp-permissions>
<privapp-permissions package="com.android.systemui">
@@ -132,5 +133,6 @@
<permission name="android.permission.WRITE_MEDIA_STORAGE"/>
<permission name="android.permission.WRITE_SECURE_SETTINGS"/>
<permission name="android.permission.WRITE_SYNC_SETTINGS"/>
+ <permission name="lineageos.permission.MANAGE_LIVEDISPLAY" />
</privapp-permissions></permissions>
diff --git a/config/versions.mk b/config/versions.mk
index a102851..175ade5 100644
--- a/config/versions.mk
+++ b/config/versions.mk
@@ -1,7 +1,7 @@
# Versioning System For Bliss
# Bliss RELEASE VERSION
BLISS_VERSION_MAJOR = 15
-BLISS_VERSION_MINOR = 6
+BLISS_VERSION_MINOR = 8.2
BLISS_CODENAME = Arcadia
#BLISS_VERSION_MAINTENANCE = Beta
@@ -46,6 +46,9 @@
BLISS_BUILD_ZIP := Bliss-v$(VERSION)-$(BLISS_BUILD)-$(BLISS_BUILDTYPE)-$(BLISS_BUILD_VARIANT)-$(shell date +%Y%m%d)
endif
+# Set Security Patch Level
+BLISS_SECURITY_PATCH := 2022-11-01
+
BLISS_DEVICE := $(BLISS_BUILD)
BLISS_VERSION := $(VERSION)
BLISS_DISPLAY_BUILDTYPE := $(BLISS_BUILDTYPE)
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_batman.webp b/packages/UdfpsResources/res/drawable/udfps_icon_batman.webp
new file mode 100644
index 0000000..b013d2f
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_batman.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_batman_flat.webp b/packages/UdfpsResources/res/drawable/udfps_icon_batman_flat.webp
new file mode 100644
index 0000000..2becd34
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_batman_flat.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_default_0.webp b/packages/UdfpsResources/res/drawable/udfps_icon_default_0.webp
new file mode 100644
index 0000000..4b62e9b
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_default_0.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_default_1.webp b/packages/UdfpsResources/res/drawable/udfps_icon_default_1.webp
new file mode 100644
index 0000000..fbc5310
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_default_1.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_default_1.xml b/packages/UdfpsResources/res/drawable/udfps_icon_default_1.xml
deleted file mode 100644
index ffeafd7..0000000
--- a/packages/UdfpsResources/res/drawable/udfps_icon_default_1.xml
+++ /dev/null
@@ -1,28 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:aapt="http://schemas.android.com/aapt"
- android:width="100dp"
- android:height="100dp"
- android:viewportWidth="100"
- android:viewportHeight="100">
- <path
- android:strokeColor="?android:attr/colorAccent"
- android:strokeLineCap="round"
- android:strokeWidth="2.36863613"
- android:pathData="M84.958,68.627C85.988,60.353 85.723,51.776 83.984,43.152l-0.01,0.001C81.401,30.388 72.122,20.687 60.546,16.976M54.635,15.64C50.907,15.136 47.033,15.235 43.138,16.021 24.367,19.805 12.22,38.088 16.004,56.858l0.012,-0.003c0.657,3.257 -0.363,6.461 -2.461,8.725m64.558,12.332c2.021,-7.581 2.861,-15.563 2.348,-23.695m-0.658,-6.239c-0.19,-1.281 -0.414,-2.563 -0.673,-3.847l-0.006,-0C75.879,28.04 60.206,17.627 44.116,20.871 31.75,23.365 22.737,33.198 20.699,44.921m-0.411,6.261c0.064,1.554 0.25,3.124 0.567,4.698l0.015,-0.004c1.111,5.509 -0.976,10.92 -4.98,14.313m2.796,4.109c5.596,-4.496 8.556,-11.878 7.038,-19.4l-0.019,0.004C23.821,45.556 27.465,36.379 34.386,30.759m5.262,-3.27c1.705,-0.782 3.527,-1.381 5.446,-1.767 7.582,-1.529 15.053,0.581 20.604,5.127m4.327,4.577c2.038,2.797 3.519,6.068 4.249,9.683l0.002,0.001c2.693,13.354 1.351,26.585 -3.181,38.433m-6.89,3.445c1.797,-3.688 3.247,-7.556 4.317,-11.553m1.331,-6.167C71.084,61.787 71.007,53.962 69.419,46.089l0.003,-0.002C67.258,35.354 56.804,28.408 46.072,30.572 35.339,32.737 28.393,43.191 30.558,53.924l0.023,-0.005c0.514,2.549 0.617,5.086 0.354,7.541m-1.535,6.307c-1.548,3.986 -4.109,7.527 -7.43,10.248M57.572,88.888C64.71,76.719 67.572,61.984 64.564,47.068l0.007,-0.003C63.676,42.627 60.893,39.052 57.227,37.008m-6.073,-1.837c-1.341,-0.105 -2.719,-0.028 -4.103,0.252 -8.054,1.624 -13.266,9.468 -11.642,17.523l0.028,-0.005C37.632,63.834 33.573,74.536 25.731,81.327m25.524,8.278c4.958,-7.245 8.174,-15.674 9.192,-24.604m0.348,-6.282C60.785,55.2 60.432,51.629 59.71,48.047l0.011,-0.004c-1.083,-5.374 -6.318,-8.853 -11.693,-7.769 -4.015,0.809 -6.971,3.935 -7.758,7.706m0.397,6.213C42.219,65.652 37.938,76.719 29.959,84.184m15.348,5.169C53.909,78.346 57.833,63.792 54.855,49.025l0.015,-0.005c-0.544,-2.696 -3.169,-4.44 -5.864,-3.896 -2.695,0.544 -4.439,3.169 -3.896,5.865l0.035,-0.006c1.109,5.501 1.021,10.967 -0.084,16.126m-1.829,6.091c-1.941,4.974 -4.868,9.513 -8.592,13.331m5.122,1.755C48.637,78.183 52.863,64.202 50,50.004m-38.825,7.829c0.115,0.569 0.241,1.132 0.379,1.69m78.074,-8.72c0.054,-2.841 -0.197,-5.731 -0.782,-8.632m-0.021,0.004C86.734,31.809 80.775,23.21 72.752,17.58M67.422,14.427C59.859,10.715 51.057,9.376 42.16,11.17 32.053,13.207 23.627,18.923 17.994,26.642m-3.281,5.328c-3.941,7.697 -5.402,16.731 -3.56,25.867" />
-</vector>
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_default_2.webp b/packages/UdfpsResources/res/drawable/udfps_icon_default_2.webp
index 1c3a7a0..f058458 100644
--- a/packages/UdfpsResources/res/drawable/udfps_icon_default_2.webp
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_default_2.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_default_3.webp b/packages/UdfpsResources/res/drawable/udfps_icon_default_3.webp
index d436866..f6a16a0 100644
--- a/packages/UdfpsResources/res/drawable/udfps_icon_default_3.webp
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_default_3.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_default_4.webp b/packages/UdfpsResources/res/drawable/udfps_icon_default_4.webp
index c917ae9..deeafff 100644
--- a/packages/UdfpsResources/res/drawable/udfps_icon_default_4.webp
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_default_4.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_default_5.webp b/packages/UdfpsResources/res/drawable/udfps_icon_default_5.webp
index b335917..e206b4f 100644
--- a/packages/UdfpsResources/res/drawable/udfps_icon_default_5.webp
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_default_5.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_gxzw.webp b/packages/UdfpsResources/res/drawable/udfps_icon_gxzw.webp
new file mode 100644
index 0000000..6c029ce
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_gxzw.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_huawei.webp b/packages/UdfpsResources/res/drawable/udfps_icon_huawei.webp
new file mode 100644
index 0000000..5f64613
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_huawei.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_light.png b/packages/UdfpsResources/res/drawable/udfps_icon_light.png
new file mode 100644
index 0000000..2bfd519
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_light.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_madness_v2.webp b/packages/UdfpsResources/res/drawable/udfps_icon_madness_v2.webp
new file mode 100644
index 0000000..47f8b9f
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_madness_v2.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_mclaren.png b/packages/UdfpsResources/res/drawable/udfps_icon_mclaren.png
new file mode 100644
index 0000000..3444802
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_mclaren.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_mi.png b/packages/UdfpsResources/res/drawable/udfps_icon_mi.png
new file mode 100644
index 0000000..e61eafc
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_mi.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc1.png b/packages/UdfpsResources/res/drawable/udfps_icon_misc1.png
new file mode 100644
index 0000000..7fa0165
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc1.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc2.png b/packages/UdfpsResources/res/drawable/udfps_icon_misc2.png
new file mode 100644
index 0000000..ff4df07
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc2.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc3.png b/packages/UdfpsResources/res/drawable/udfps_icon_misc3.png
new file mode 100644
index 0000000..88dd44a
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc3.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc4.png b/packages/UdfpsResources/res/drawable/udfps_icon_misc4.png
new file mode 100644
index 0000000..881ed01
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc4.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc5.png b/packages/UdfpsResources/res/drawable/udfps_icon_misc5.png
new file mode 100644
index 0000000..8212743
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc5.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc6.png b/packages/UdfpsResources/res/drawable/udfps_icon_misc6.png
new file mode 100644
index 0000000..34d557a
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc6.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc7.png b/packages/UdfpsResources/res/drawable/udfps_icon_misc7.png
new file mode 100644
index 0000000..194d03c
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc7.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc_1.png b/packages/UdfpsResources/res/drawable/udfps_icon_misc_1.png
new file mode 100644
index 0000000..db40468
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc_1.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc_10.webp b/packages/UdfpsResources/res/drawable/udfps_icon_misc_10.webp
new file mode 100644
index 0000000..518149d
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc_10.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc_11.webp b/packages/UdfpsResources/res/drawable/udfps_icon_misc_11.webp
new file mode 100644
index 0000000..db9c48b
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc_11.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc_12.webp b/packages/UdfpsResources/res/drawable/udfps_icon_misc_12.webp
new file mode 100644
index 0000000..aeaafed
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc_12.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc_13.webp b/packages/UdfpsResources/res/drawable/udfps_icon_misc_13.webp
new file mode 100644
index 0000000..e20d0b9
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc_13.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc_14.webp b/packages/UdfpsResources/res/drawable/udfps_icon_misc_14.webp
new file mode 100644
index 0000000..680b2a8
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc_14.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc_15.webp b/packages/UdfpsResources/res/drawable/udfps_icon_misc_15.webp
new file mode 100644
index 0000000..e35fd83
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc_15.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc_2.png b/packages/UdfpsResources/res/drawable/udfps_icon_misc_2.png
new file mode 100644
index 0000000..988c4ba
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc_2.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc_3.png b/packages/UdfpsResources/res/drawable/udfps_icon_misc_3.png
new file mode 100644
index 0000000..90fddd8
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc_3.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc_4.png b/packages/UdfpsResources/res/drawable/udfps_icon_misc_4.png
new file mode 100644
index 0000000..83f0f2f
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc_4.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc_5.png b/packages/UdfpsResources/res/drawable/udfps_icon_misc_5.png
new file mode 100644
index 0000000..878c099
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc_5.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc_6.png b/packages/UdfpsResources/res/drawable/udfps_icon_misc_6.png
new file mode 100644
index 0000000..2f85b71
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc_6.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc_7.png b/packages/UdfpsResources/res/drawable/udfps_icon_misc_7.png
new file mode 100644
index 0000000..264ff6c
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc_7.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc_8.png b/packages/UdfpsResources/res/drawable/udfps_icon_misc_8.png
new file mode 100644
index 0000000..612c4f3
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc_8.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_misc_9.png b/packages/UdfpsResources/res/drawable/udfps_icon_misc_9.png
new file mode 100644
index 0000000..cee38a7
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_misc_9.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_miui.webp b/packages/UdfpsResources/res/drawable/udfps_icon_miui.webp
new file mode 100644
index 0000000..1c3a7a0
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_miui.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_op.webp b/packages/UdfpsResources/res/drawable/udfps_icon_op.webp
new file mode 100644
index 0000000..d436866
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_op.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_op_2077.webp b/packages/UdfpsResources/res/drawable/udfps_icon_op_2077.webp
new file mode 100644
index 0000000..6f832c4
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_op_2077.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_op_rainbow.webp b/packages/UdfpsResources/res/drawable/udfps_icon_op_rainbow.webp
new file mode 100644
index 0000000..628e477
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_op_rainbow.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_pacman.webp b/packages/UdfpsResources/res/drawable/udfps_icon_pacman.webp
new file mode 100644
index 0000000..518149d
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_pacman.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_pokeball.webp b/packages/UdfpsResources/res/drawable/udfps_icon_pokeball.webp
new file mode 100644
index 0000000..db9c48b
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_pokeball.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_pokeball_1.webp b/packages/UdfpsResources/res/drawable/udfps_icon_pokeball_1.webp
new file mode 100644
index 0000000..aeaafed
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_pokeball_1.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_pokeball_2.webp b/packages/UdfpsResources/res/drawable/udfps_icon_pokeball_2.webp
new file mode 100644
index 0000000..e20d0b9
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_pokeball_2.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_1.png b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_1.png
new file mode 100644
index 0000000..f0e7679
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_1.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_2.png b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_2.png
new file mode 100644
index 0000000..d7d5df9
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_2.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_3.png b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_3.png
new file mode 100644
index 0000000..e946903
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_3.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_4.png b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_4.png
new file mode 100644
index 0000000..4ebaf26
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_4.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_5.png b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_5.png
new file mode 100644
index 0000000..9981677
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_5.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_6.png b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_6.png
new file mode 100644
index 0000000..ca8ca71
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_6.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_7.png b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_7.png
new file mode 100644
index 0000000..6803efe
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_7.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_8.png b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_8.png
new file mode 100644
index 0000000..2171f1d
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_8.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_9.png b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_9.png
new file mode 100644
index 0000000..ab15e9b
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_sharingan_9.png
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_spiderman.webp b/packages/UdfpsResources/res/drawable/udfps_icon_spiderman.webp
new file mode 100644
index 0000000..680b2a8
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_spiderman.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_unfunnyguy.webp b/packages/UdfpsResources/res/drawable/udfps_icon_unfunnyguy.webp
new file mode 100644
index 0000000..e35fd83
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_unfunnyguy.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/drawable/udfps_icon_yield.webp b/packages/UdfpsResources/res/drawable/udfps_icon_yield.webp
new file mode 100644
index 0000000..ebab645
--- /dev/null
+++ b/packages/UdfpsResources/res/drawable/udfps_icon_yield.webp
Binary files differ
diff --git a/packages/UdfpsResources/res/values/arrays.xml b/packages/UdfpsResources/res/values/arrays.xml
index 8ae2f98..e36a626 100644
--- a/packages/UdfpsResources/res/values/arrays.xml
+++ b/packages/UdfpsResources/res/values/arrays.xml
@@ -21,27 +21,76 @@
<string-array name="udfps_icons">
<item>udfps_icon_default</item>
+ <item>udfps_icon_miui</item>
+ <item>udfps_icon_op</item>
+ <item>udfps_icon_op_2077</item>
+ <item>udfps_icon_op_rainbow</item>
+ <item>udfps_icon_default_0</item>
+ <item>udfps_icon_default_1</item>
<item>udfps_icon_default_2</item>
<item>udfps_icon_default_3</item>
<item>udfps_icon_default_4</item>
<item>udfps_icon_default_5</item>
+ <item>udfps_icon_huawei</item>
+ <item>udfps_icon_madness_v2</item>
+ <item>udfps_icon_unfunnyguy</item>
+ <item>udfps_icon_yield</item>
<item>udfps_icon_arc_reactor</item>
<item>udfps_icon_cpt_america_flat</item>
+ <item>udfps_icon_batman</item>
+ <item>udfps_icon_batman_flat</item>
<item>udfps_icon_cpt_america_flat_gray</item>
<item>udfps_icon_dragon_black_flat</item>
- <item>udfps_icon_glow_circle</item>
+ <item>udfps_icon_fire_ice_ouroboros</item>
+ <item>udfps_icon_mclaren</item>
+ <item>udfps_icon_mi</item>
+ <item>udfps_icon_sharingan_1</item>
+ <item>udfps_icon_sharingan_2</item>
+ <item>udfps_icon_sharingan_3</item>
+ <item>udfps_icon_sharingan_4</item>
+ <item>udfps_icon_sharingan_5</item>
+ <item>udfps_icon_sharingan_6</item>
+ <item>udfps_icon_sharingan_7</item>
+ <item>udfps_icon_sharingan_8</item>
+ <item>udfps_icon_sharingan_9</item>
+ <item>udfps_icon_gxzw</item>
+ <item>udfps_icon_light</item>
+ <item>udfps_icon_misc_1</item>
+ <item>udfps_icon_misc_2</item>
+ <item>udfps_icon_misc_3</item>
+ <item>udfps_icon_misc_4</item>
+ <item>udfps_icon_misc_5</item>
+ <item>udfps_icon_misc_6</item>
+ <item>udfps_icon_misc_7</item>
+ <item>udfps_icon_misc_8</item>
+ <item>udfps_icon_misc_9</item>
+ <item>udfps_icon_misc_10</item>
+ <item>udfps_icon_misc_11</item>
+ <item>udfps_icon_misc_12</item>
+ <item>udfps_icon_misc_13</item>
+ <item>udfps_icon_misc_14</item>
+ <item>udfps_icon_misc_15</item>
<item>udfps_icon_neon_arc</item>
<item>udfps_icon_neon_arc_gray</item>
- <item>udfps_icon_neon_circle_pink</item>
<item>udfps_icon_neon_triangle</item>
- <item>udfps_icon_paint_splash_circle</item>
+ <item>udfps_icon_pacman</item>
+ <item>udfps_icon_pokeball</item>
+ <item>udfps_icon_pokeball_1</item>
+ <item>udfps_icon_pokeball_2</item>
<item>udfps_icon_rainbow_horn</item>
+ <item>udfps_icon_scratch_pink_blue</item>
+ <item>udfps_icon_scratch_red_blue</item>
<item>udfps_icon_shooky</item>
+ <item>udfps_icon_spiderman</item>
<item>udfps_icon_spiral_blue</item>
<item>udfps_icon_sun_metro</item>
- <item>udfps_icon_scratch_red_blue</item>
- <item>udfps_icon_scratch_pink_blue</item>
- <item>udfps_icon_fire_ice_ouroboros</item>
+ <item>udfps_icon_misc1</item>
+ <item>udfps_icon_misc2</item>
+ <item>udfps_icon_misc3</item>
+ <item>udfps_icon_misc4</item>
+ <item>udfps_icon_misc5</item>
+ <item>udfps_icon_misc6</item>
+ <item>udfps_icon_misc7</item>
<item>udfps_icon_transparent</item>
</string-array>
diff --git a/prebuilt/common/etc/init/smartcharge-init.rc b/prebuilt/common/etc/init/smartcharge-init.rc
index 63c9204..d67252b 100644
--- a/prebuilt/common/etc/init/smartcharge-init.rc
+++ b/prebuilt/common/etc/init/smartcharge-init.rc
@@ -1,2 +1,7 @@
on post-fs-data
+ chown system system /sys/class/power_supply/battery/battery_charging_enabled
+ chmod 0666 /sys/class/power_supply/battery/battery_charging_enabled
+ chown system system /sys/class/power_supply/battery/charging_enabled
+ chmod 0666 /sys/class/power_supply/battery/charging_enabled
chown system system /sys/class/power_supply/battery/input_suspend
+ chmod 0666 /sys/class/power_supply/battery/input_suspend
