Changes for January 2021

- Restoring /sbin, probable Magisk support - thanks @eremitein
- Fix offline charger? - same as above
- Disable that stupid wallpaper zoom

buildbot_treble.sh

@@ -48,6 +48,7 @@ echo ""
 echo "Applying universal patches"
 cd frameworks/base
 git am $BL/patches/0001-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch
+git am $BL/patches/0001-UI-Disable-wallpaper-zoom.patch
 git am $BL/patches/0001-Disable-vendor-mismatch-warning.patch
 cd ../..
 cd lineage-sdk
@@ -80,8 +81,14 @@ cd ../..
 cd frameworks/native
 git revert 581c22f979af05e48ad4843cdfa9605186d286da --no-edit # Add suspend_resume trace events to the atrace 'freq' category.
 cd ../..
+cd packages/apps/Bluetooth
+git revert 4ceb47e32c1be30640e40f81b6f741942f8598ed --no-edit # Bluetooth: Reset packages/apps/Bluetooth to upstream
+cd ../../..
 cd system/core
 git am $BL/patches/0001-Revert-init-Add-vendor-specific-initialization-hooks.patch
+git am $BL/patches/0001-Panic-into-recovery-rather-than-bootloader.patch
+git am $BL/patches/0001-Restore-sbin.patch
+git am $BL/patches/0001-fix-offline-charger-v7.patch
 cd ../..
 cd system/hardware/interfaces
 git revert cb732f9b635b5f6f79e447ddaf743ebb800b8535 --no-edit # system_suspend: start early

patches/0001-Panic-into-recovery-rather-than-bootloader.patch

@@ -0,0 +1,38 @@
+From 3f53458d7d730e91e4d736c5619621a5ae367500 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Wed, 4 Sep 2019 21:11:48 +0200
+Subject: [PATCH 1/5] Panic into recovery rather than bootloader
+
+Getting last_kmsg/pstore from bootloader isn't possible for other people
+than the OEM, but we have TWRP to access last_kmsg/pstore
+
+Change-Id: If04bb6572dc66677d7b44f7d302b2d69ce526200
+---
+ init/reboot_utils.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/init/reboot_utils.cpp b/init/reboot_utils.cpp
+index 76460a5df..5a12dd7af 100644
+--- a/init/reboot_utils.cpp
++++ b/init/reboot_utils.cpp
+@@ -34,7 +34,7 @@
+ namespace android {
+ namespace init {
+ 
+-static std::string init_fatal_reboot_target = "bootloader";
++static std::string init_fatal_reboot_target = "recovery";
+ static bool init_fatal_panic = false;
+ 
+ void SetFatalRebootTarget() {
+@@ -48,7 +48,7 @@ void SetFatalRebootTarget() {
+     const char kRebootTargetString[] = "androidboot.init_fatal_reboot_target=";
+     auto start_pos = cmdline.find(kRebootTargetString);
+     if (start_pos == std::string::npos) {
+-        return;  // We already default to bootloader if no setting is provided.
++        return;  // We already default to recovery if no setting is provided
+     }
+     start_pos += sizeof(kRebootTargetString) - 1;
+ 
+-- 
+2.17.1
+

patches/0001-Restore-sbin.patch

@@ -0,0 +1,71 @@
+From 15359fa07d5f0216a6916662cc8dfce2e8e4b050 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 10 Jan 2021 05:10:39 +0000
+Subject: [PATCH] Restore /sbin
+
+This reverts "Do not create /sbin" and "Remove sbin from fs_config.cpp".
+
+Change-Id: Iade1d5e8ec8df8e3dcfbdeef3367dbe56996ae6f
+---
+ CleanSpec.mk            | 2 --
+ libcutils/fs_config.cpp | 3 +++
+ rootdir/Android.mk      | 2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/CleanSpec.mk b/CleanSpec.mk
+index 0a534a2bd..81150a0fa 100644
+--- a/CleanSpec.mk
++++ b/CleanSpec.mk
+@@ -80,8 +80,6 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/vndksp.libraries.txt)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/sbin/charger)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/sbin/charger)
+-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/sbin)
+-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/sbin)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/product_services)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/product_services.img)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product_services)
+diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
+index 5805a4d19..b30707fc8 100644
+--- a/libcutils/fs_config.cpp
++++ b/libcutils/fs_config.cpp
+@@ -80,6 +80,7 @@ static const struct fs_path_config android_dirs[] = {
+     { 00771, AID_SYSTEM,       AID_SYSTEM,       0, "data" },
+     { 00755, AID_ROOT,         AID_SYSTEM,       0, "mnt" },
+     { 00751, AID_ROOT,         AID_SHELL,        0, "product/bin" },
++    { 00750, AID_ROOT,         AID_SHELL,        0, "sbin" },
+     { 00777, AID_ROOT,         AID_ROOT,         0, "sdcard" },
+     { 00751, AID_ROOT,         AID_SDCARD_R,     0, "storage" },
+     { 00751, AID_ROOT,         AID_SHELL,        0, "system/bin" },
+@@ -164,6 +165,7 @@ static const struct fs_path_config android_files[] = {
+     { 00600, AID_ROOT,      AID_ROOT,      0, "system_ext/build.prop" },
+     { 00444, AID_ROOT,      AID_ROOT,      0, system_ext_conf_dir + 1 },
+     { 00444, AID_ROOT,      AID_ROOT,      0, system_ext_conf_file + 1 },
++    { 00750, AID_ROOT,      AID_SHELL,     0, "sbin/fs_mgr" },
+     { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump32" },
+     { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump64" },
+     { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/debuggerd" },
+@@ -209,6 +211,7 @@ static const struct fs_path_config android_files[] = {
+     { 00750, AID_ROOT,      AID_SHELL,     0, "init*" },
+     { 00755, AID_ROOT,      AID_SHELL,     0, "odm/bin/*" },
+     { 00755, AID_ROOT,      AID_SHELL,     0, "product/bin/*" },
++    { 00750, AID_ROOT,      AID_SHELL,     0, "sbin/*" },
+     { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/*" },
+     { 00755, AID_ROOT,      AID_SHELL,     0, "system/xbin/*" },
+     { 00755, AID_ROOT,      AID_SHELL,     0, "system/apex/*/bin/*" },
+diff --git a/rootdir/Android.mk b/rootdir/Android.mk
+index a9d0ed08a..56b0d5b5b 100644
+--- a/rootdir/Android.mk
++++ b/rootdir/Android.mk
+@@ -77,7 +77,7 @@ endif
+ #
+ # create some directories (some are mount points) and symlinks
+ LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \
+-    dev proc sys system data data_mirror odm oem acct config storage mnt apex debug_ramdisk \
++    sbin dev proc sys system data data_mirror odm oem acct config storage mnt apex debug_ramdisk \
+     linkerconfig $(BOARD_ROOT_EXTRA_FOLDERS)); \
+     ln -sf /system/bin $(TARGET_ROOT_OUT)/bin; \
+     ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \
+-- 
+2.25.1
+

patches/0001-Squashed-revert-of-LOS-FOD-implementation.patch

@@ -1,4 +1,4 @@
-From 9badbe171d757a64ba76bdd247018e97d5e85066 Mon Sep 17 00:00:00 2001
+From 30abf39af77e87b0b4fd8c11d3bc9a601b1b31bd Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 13 Dec 2020 02:22:12 +0000
 Subject: [PATCH] Squashed revert of LOS FOD implementation
@@ -16,7 +16,7 @@ Change-Id: I4650cef96617c32e52d5dd088c8afffb06ab5e1d
  packages/SystemUI/res/values/config.xml       |   1 -
  .../SystemUI/res/values/lineage_config.xml    |   4 -
  .../keyguard/KeyguardSecurityContainer.java   |  15 +-
- .../systemui/biometrics/FODCircleView.java    | 535 ------------------
+ .../systemui/biometrics/FODCircleView.java    | 544 ------------------
  .../biometrics/FODCircleViewImpl.java         |  73 ---
  .../systemui/dagger/SystemUIBinder.java       |   7 -
  .../keyguard/KeyguardViewMediator.java        |  10 +-
@@ -26,7 +26,7 @@ Change-Id: I4650cef96617c32e52d5dd088c8afffb06ab5e1d
  .../biometrics/BiometricServiceBase.java      |   2 +-
  .../fingerprint/FingerprintService.java       | 112 ----
  .../statusbar/StatusBarManagerService.java    |  22 -
- 19 files changed, 5 insertions(+), 875 deletions(-)
+ 19 files changed, 5 insertions(+), 884 deletions(-)
  delete mode 100644 packages/SystemUI/res-keyguard/values/lineage_dimens.xml
  delete mode 100644 packages/SystemUI/res/drawable-nodpi/fod_icon_pressed.png
  delete mode 100644 packages/SystemUI/res/drawable/fod_icon_default.xml
@@ -34,7 +34,7 @@ Change-Id: I4650cef96617c32e52d5dd088c8afffb06ab5e1d
  delete mode 100644 packages/SystemUI/src/com/android/systemui/biometrics/FODCircleViewImpl.java
 
 diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl
-index 44607f7f5fbd..83b672e06b01 100644
+index 44607f7f5fb..83b672e06b0 100644
 --- a/core/java/com/android/internal/statusbar/IStatusBar.aidl
 +++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl
 @@ -228,12 +228,6 @@ oneway interface IStatusBar
@@ -51,7 +51,7 @@ index 44607f7f5fbd..83b672e06b01 100644
       * Used to block or unblock usage of gestural navigation
       */
 diff --git a/core/java/com/android/internal/statusbar/IStatusBarService.aidl b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
-index e9b0683db89c..ca0eccdbc6e6 100644
+index e9b0683db89..ca0eccdbc6e 100644
 --- a/core/java/com/android/internal/statusbar/IStatusBarService.aidl
 +++ b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
 @@ -148,12 +148,6 @@ interface IStatusBarService
@@ -68,7 +68,7 @@ index e9b0683db89c..ca0eccdbc6e6 100644
       * Starts the default assistant app.
       */
 diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
-index c78630c05f08..84870f83ad2e 100644
+index c78630c05f0..84870f83ad2 100644
 --- a/packages/SystemUI/Android.bp
 +++ b/packages/SystemUI/Android.bp
 @@ -71,7 +71,6 @@ android_library {
@@ -89,7 +89,7 @@ index c78630c05f08..84870f83ad2e 100644
      libs: [
 diff --git a/packages/SystemUI/res-keyguard/values/lineage_dimens.xml b/packages/SystemUI/res-keyguard/values/lineage_dimens.xml
 deleted file mode 100644
-index bb6070c7199d..000000000000
+index bb6070c7199..00000000000
 --- a/packages/SystemUI/res-keyguard/values/lineage_dimens.xml
 +++ /dev/null
 @@ -1,20 +0,0 @@
@@ -127,7 +127,7 @@ D@OB!I
 
 diff --git a/packages/SystemUI/res/drawable/fod_icon_default.xml b/packages/SystemUI/res/drawable/fod_icon_default.xml
 deleted file mode 100644
-index 38e9d3111286..000000000000
+index 38e9d311128..00000000000
 --- a/packages/SystemUI/res/drawable/fod_icon_default.xml
 +++ /dev/null
 @@ -1,25 +0,0 @@
@@ -157,7 +157,7 @@ index 38e9d3111286..000000000000
 -        android:pathData="M17.81,4.47c-0.08,0 -0.16,-0.02 -0.23,-0.06C15.66,3.42 14,3 12.01,3c-1.98,0 -3.86,0.47 -5.57,1.41 -0.24,0.13 -0.54,0.04 -0.68,-0.2 -0.13,-0.24 -0.04,-0.55 0.2,-0.68C7.82,2.52 9.86,2 12.01,2c2.13,0 3.99,0.47 6.03,1.52 0.25,0.13 0.34,0.43 0.21,0.67 -0.09,0.18 -0.26,0.28 -0.44,0.28zM3.5,9.72c-0.1,0 -0.2,-0.03 -0.29,-0.09 -0.23,-0.16 -0.28,-0.47 -0.12,-0.7 0.99,-1.4 2.25,-2.5 3.75,-3.27C9.98,4.04 14,4.03 17.15,5.65c1.5,0.77 2.76,1.86 3.75,3.25 0.16,0.22 0.11,0.54 -0.12,0.7 -0.23,0.16 -0.54,0.11 -0.7,-0.12 -0.9,-1.26 -2.04,-2.25 -3.39,-2.94 -2.87,-1.47 -6.54,-1.47 -9.4,0.01 -1.36,0.7 -2.5,1.7 -3.4,2.96 -0.08,0.14 -0.23,0.21 -0.39,0.21zM9.75,21.79c-0.13,0 -0.26,-0.05 -0.35,-0.15 -0.87,-0.87 -1.34,-1.43 -2.01,-2.64 -0.69,-1.23 -1.05,-2.73 -1.05,-4.34 0,-2.97 2.54,-5.39 5.66,-5.39s5.66,2.42 5.66,5.39c0,0.28 -0.22,0.5 -0.5,0.5s-0.5,-0.22 -0.5,-0.5c0,-2.42 -2.09,-4.39 -4.66,-4.39 -2.57,0 -4.66,1.97 -4.66,4.39 0,1.44 0.32,2.77 0.93,3.85 0.64,1.15 1.08,1.64 1.85,2.42 0.19,0.2 0.19,0.51 0,0.71 -0.11,0.1 -0.24,0.15 -0.37,0.15zM16.92,19.94c-1.19,0 -2.24,-0.3 -3.1,-0.89 -1.49,-1.01 -2.38,-2.65 -2.38,-4.39 0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5c0,1.41 0.72,2.74 1.94,3.56 0.71,0.48 1.54,0.71 2.54,0.71 0.24,0 0.64,-0.03 1.04,-0.1 0.27,-0.05 0.53,0.13 0.58,0.41 0.05,0.27 -0.13,0.53 -0.41,0.58 -0.57,0.11 -1.07,0.12 -1.21,0.12zM14.91,22c-0.04,0 -0.09,-0.01 -0.13,-0.02 -1.59,-0.44 -2.63,-1.03 -3.72,-2.1 -1.4,-1.39 -2.17,-3.24 -2.17,-5.22 0,-1.62 1.38,-2.94 3.08,-2.94 1.7,0 3.08,1.32 3.08,2.94 0,1.07 0.93,1.94 2.08,1.94s2.08,-0.87 2.08,-1.94c0,-3.77 -3.25,-6.83 -7.25,-6.83 -2.84,0 -5.44,1.58 -6.61,4.03 -0.39,0.81 -0.59,1.76 -0.59,2.8 0,0.78 0.07,2.01 0.67,3.61 0.1,0.26 -0.03,0.55 -0.29,0.64 -0.26,0.1 -0.55,-0.04 -0.64,-0.29 -0.49,-1.31 -0.73,-2.61 -0.73,-3.96 0,-1.2 0.23,-2.29 0.68,-3.24 1.33,-2.79 4.28,-4.6 7.51,-4.6 4.55,0 8.25,3.51 8.25,7.83 0,1.62 -1.38,2.94 -3.08,2.94s-3.08,-1.32 -3.08,-2.94c0,-1.07 -0.93,-1.94 -2.08,-1.94s-2.08,0.87 -2.08,1.94c0,1.71 0.66,3.31 1.87,4.51 0.95,0.94 1.86,1.46 3.27,1.85 0.27,0.07 0.42,0.35 0.35,0.61 -0.05,0.23 -0.26,0.38 -0.47,0.38z" />
 -</vector>
 diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
-index 74906e259fa9..49b7eab8a696 100644
+index 74906e259fa..49b7eab8a69 100644
 --- a/packages/SystemUI/res/values/config.xml
 +++ b/packages/SystemUI/res/values/config.xml
 @@ -319,7 +319,6 @@
@@ -169,10 +169,10 @@ index 74906e259fa9..49b7eab8a696 100644
          <item>com.android.systemui.SizeCompatModeActivityController</item>
          <item>com.android.systemui.statusbar.notification.InstantAppNotifier</item>
 diff --git a/packages/SystemUI/res/values/lineage_config.xml b/packages/SystemUI/res/values/lineage_config.xml
-index 2bb268216e33..2aca126a8feb 100644
+index fedec32250d..8fa6fbecb53 100644
 --- a/packages/SystemUI/res/values/lineage_config.xml
 +++ b/packages/SystemUI/res/values/lineage_config.xml
-@@ -14,10 +14,6 @@
+@@ -15,10 +15,6 @@
       limitations under the License.
  -->
  <resources>
@@ -184,7 +184,7 @@ index 2bb268216e33..2aca126a8feb 100644
      <integer name="config_maxVisibleNotificationIcons">4</integer>
      <integer name="config_maxVisibleNotificationIconsOnLock">5</integer>
 diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
-index bace9324ac93..1db2e32b8cdb 100644
+index bace9324ac9..1db2e32b8cd 100644
 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
 +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
 @@ -33,7 +33,6 @@ import android.app.AlertDialog;
@@ -246,10 +246,10 @@ index bace9324ac93..1db2e32b8cdb 100644
  
 diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java b/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java
 deleted file mode 100644
-index 4012e6112afe..000000000000
+index db2ab659709..00000000000
 --- a/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java
 +++ /dev/null
-@@ -1,535 +0,0 @@
+@@ -1,544 +0,0 @@
 -/**
 - * Copyright (C) 2019-2020 The LineageOS Project
 - *
@@ -330,6 +330,7 @@ index 4012e6112afe..000000000000
 -    private boolean mIsCircleShowing;
 -    private boolean mIsDreaming;
 -    private boolean mIsKeyguard;
+-    private boolean mTouchedOutside;
 -
 -    private Handler mHandler;
 -
@@ -479,11 +480,13 @@ index 4012e6112afe..000000000000
 -        mParams.packageName = "android";
 -        mParams.type = WindowManager.LayoutParams.TYPE_DISPLAY_OVERLAY;
 -        mParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE |
--                WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
+-                WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN |
+-                WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH;
 -        mParams.gravity = Gravity.TOP | Gravity.LEFT;
 -
 -        mPressedParams.copyFrom(mParams);
--        mPressedParams.flags |= WindowManager.LayoutParams.FLAG_DIM_BEHIND;
+-        mPressedParams.flags |= WindowManager.LayoutParams.FLAG_DIM_BEHIND |
+-                WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH;
 -
 -        mParams.setTitle("Fingerprint on display");
 -        mPressedParams.setTitle("Fingerprint on display.touched");
@@ -524,6 +527,12 @@ index 4012e6112afe..000000000000
 -        float y = event.getAxisValue(MotionEvent.AXIS_Y);
 -
 -        boolean newIsInside = (x > 0 && x < mSize) && (y > 0 && y < mSize);
+-        mTouchedOutside = false;
+-
+-        if (event.getAction() == MotionEvent.ACTION_OUTSIDE) {
+-            mTouchedOutside = true;
+-            return true;
+-        }
 -
 -        if (event.getAction() == MotionEvent.ACTION_DOWN && newIsInside) {
 -            showCircle();
@@ -598,7 +607,7 @@ index 4012e6112afe..000000000000
 -    }
 -
 -    public void showCircle() {
--        if (mFading) return;
+-        if (mFading || mTouchedOutside) return;
 -        mIsCircleShowing = true;
 -
 -        setKeepScreenOn(true);
@@ -787,7 +796,7 @@ index 4012e6112afe..000000000000
 -}
 diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleViewImpl.java b/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleViewImpl.java
 deleted file mode 100644
-index ca4fd6b99a02..000000000000
+index ca4fd6b99a0..00000000000
 --- a/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleViewImpl.java
 +++ /dev/null
 @@ -1,73 +0,0 @@
@@ -865,7 +874,7 @@ index ca4fd6b99a02..000000000000
 -    }
 -}
 diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java
-index a0a2e6f0dd6f..413a522bccdc 100644
+index a0a2e6f0dd6..413a522bccd 100644
 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java
 +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java
 @@ -24,7 +24,6 @@ import com.android.systemui.SystemUI;
@@ -890,7 +899,7 @@ index a0a2e6f0dd6f..413a522bccdc 100644
      @Binds
      @IntoMap
 diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
-index 941bd3fdf274..6394dc9a17d8 100644
+index 941bd3fdf27..6394dc9a17d 100644
 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
 +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
 @@ -38,7 +38,6 @@ import android.content.ContentResolver;
@@ -939,7 +948,7 @@ index 941bd3fdf274..6394dc9a17d8 100644
              // Lock immediately based on setting if secure (user has a pin/pattern/password).
              // This also "locks" the device when not secure to provide easy access to the
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
-index 5f3875701e48..39b6aa1a3609 100644
+index 5f3875701e4..39b6aa1a360 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
 @@ -126,8 +126,6 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController<
@@ -999,7 +1008,7 @@ index 5f3875701e48..39b6aa1a3609 100644
                      for (int i = 0; i < mCallbacks.size(); i++) {
                          mCallbacks.get(i).setBlockedGesturalNavigation((Boolean) msg.obj);
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
-index ca9e61320fd1..2097cbcf9fc8 100644
+index ca9e61320fd..2097cbcf9fc 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
 @@ -116,7 +116,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
@@ -1049,7 +1058,7 @@ index ca9e61320fd1..2097cbcf9fc8 100644
          mLastRemoteInputActive = remoteInputActive;
          mLastDozing = mDozing;
 diff --git a/services/core/Android.bp b/services/core/Android.bp
-index 2510f6783819..30eea474c0e5 100644
+index 2510f678381..30eea474c0e 100644
 --- a/services/core/Android.bp
 +++ b/services/core/Android.bp
 @@ -133,7 +133,6 @@ java_library_static {
@@ -1061,7 +1070,7 @@ index 2510f6783819..30eea474c0e5 100644
  }
  
 diff --git a/services/core/java/com/android/server/biometrics/BiometricServiceBase.java b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
-index 5bb4d272eae8..70369732fead 100644
+index 5bb4d272eae..70369732fea 100644
 --- a/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
 +++ b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
 @@ -1047,7 +1047,7 @@ public abstract class BiometricServiceBase extends SystemService
@@ -1074,7 +1083,7 @@ index 5bb4d272eae8..70369732fead 100644
      }
  
 diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
-index 5b51aa6e72ac..a90fee6788a8 100644
+index 5b51aa6e72a..a90fee6788a 100644
 --- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
 +++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
 @@ -80,17 +80,12 @@ import org.json.JSONArray;
@@ -1286,7 +1295,7 @@ index 5b51aa6e72ac..a90fee6788a8 100644
          IBiometricsFingerprint daemon = getFingerprintDaemon();
          if (daemon == null) {
 diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
-index 2412209452ba..13b9508a9c8a 100644
+index 2412209452b..13b9508a9c8 100644
 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
 +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
 @@ -747,28 +747,6 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D

patches/0001-UI-Disable-wallpaper-zoom.patch

@@ -0,0 +1,28 @@
+From ecc6f5becba220a7de969bce9b17809898bf031a Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 10 Jan 2021 11:44:29 +0000
+Subject: [PATCH] UI: Disable wallpaper zoom
+
+It does little more than inducing motion sickness
+
+Change-Id: I78cc5484930b27f172cd8d8a5bd9042dce3478d0
+---
+ core/res/res/values/config.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
+index b61b26a0e7f..0ed13dd2a89 100644
+--- a/core/res/res/values/config.xml
++++ b/core/res/res/values/config.xml
+@@ -4353,7 +4353,7 @@
+     <string name="config_customSessionPolicyProvider"></string>
+ 
+     <!-- The max scale for the wallpaper when it's zoomed in -->
+-    <item name="config_wallpaperMaxScale" format="float" type="dimen">1.10</item>
++    <item name="config_wallpaperMaxScale" format="float" type="dimen">1</item>
+ 
+     <!-- Package name that will receive an explicit manifest broadcast for
+          android.os.action.POWER_SAVE_MODE_CHANGED. -->
+-- 
+2.25.1
+

patches/0001-fix-offline-charger-v7.patch

@@ -0,0 +1,52 @@
+From e55760ecf406097895a3d6d6af00873b6f563a7f Mon Sep 17 00:00:00 2001
+From: Victor Bo <bvoid@yandex.ru>
+Date: Wed, 26 Feb 2020 07:23:44 +0200
+Subject: [PATCH 4/5] fix offline charger v7
+
+	modified:   rootdir/init.rc
+---
+ rootdir/init.rc | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/rootdir/init.rc b/rootdir/init.rc
+index a9af0b094..b136f1059 100644
+--- a/rootdir/init.rc
++++ b/rootdir/init.rc
+@@ -11,6 +11,11 @@ import /vendor/etc/init/hw/init.${ro.hardware}.rc
+ import /system/etc/init/hw/init.usb.configfs.rc
+ import /system/etc/init/hw/init.${ro.zygote}.rc
+ 
++service gsicharger /bin/charger
++    class gsicharger
++    user system
++    group system shell input graphics wakelock
++
+ # Cgroups are mounted right before early-init using list from /etc/cgroups.json
+ on early-init
+     # Disable sysrq from keyboard
+@@ -399,7 +404,7 @@ on init
+ # Healthd can trigger a full boot from charger mode by signaling this
+ # property when the power button is held.
+ on property:sys.boot_from_charger_mode=1
+-    class_stop charger
++    class_stop gsicharger
+     trigger late-init
+ 
+ on load_persist_props_action
+@@ -945,8 +950,12 @@ on nonencrypted
+ on property:sys.init_log_level=*
+     loglevel ${sys.init_log_level}
+ 
++on charger && property:ro.hardware=mt*
++    write /sys/class/leds/lcd-backlight/trigger "backlight"
++    write /sys/class/android_usb/android0/enable 1
++
+ on charger
+-    class_start charger
++    class_start gsicharger
+ 
+ on property:vold.decrypt=trigger_load_persist_props
+     load_persist_props
+-- 
+2.17.1
+