This commit is contained in:
nyyu 2022-09-25 14:44:19 +02:00
parent 96a0608f19
commit 7733ce720d
3 changed files with 27 additions and 2 deletions

View File

@ -14,7 +14,6 @@ steps:
- cd /build - cd /build
- rm -rf .repo/repo - rm -rf .repo/repo
- repo init -u https://github.com/LineageOS-UL/android.git -b lineage-$version - repo init -u https://github.com/LineageOS-UL/android.git -b lineage-$version
- sed -i 's@LineageOS/android_packages_apps_Camera2"@lineage/android_packages_apps_Camera2" remote="nyyu"@' .repo/manifests/default.xml
- mkdir -p .repo/local_manifests - mkdir -p .repo/local_manifests
- cp $DRONE_WORKSPACE_BASE/$device.xml .repo/local_manifests/roomservice.xml - cp $DRONE_WORKSPACE_BASE/$device.xml .repo/local_manifests/roomservice.xml
- bash $DRONE_WORKSPACE_BASE/sync.sh - bash $DRONE_WORKSPACE_BASE/sync.sh

22
fix-camera2-legacy.patch Normal file
View File

@ -0,0 +1,22 @@
From 94afc13b04146a3adc77378b0022216b27f82ea0 Mon Sep 17 00:00:00 2001
From: nyyu <mail@nyyu.dev>
Date: Sat, 3 Sep 2022 11:38:43 +0200
Subject: [PATCH] Camera2: Disable CaptureModule for legacy device
---
.../camera/one/config/OneCameraFeatureConfigCreator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java b/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
index dc7f9003f7..474494082e 100644
--- a/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
+++ b/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
@@ -41,7 +41,7 @@ public class OneCameraFeatureConfigCreator {
public static OneCameraFeatureConfig createDefault(ContentResolver contentResolver,
MemoryManager memoryManager) {
// Enable CaptureModule on all M devices.
- boolean useCaptureModule = true;
+ boolean useCaptureModule = false;
Log.i(TAG, "CaptureModule? " + useCaptureModule);
// HDR+ has multiple levels of support.

View File

@ -20,12 +20,16 @@ cd $TOPDIR
cd packages/apps/Trebuchet cd packages/apps/Trebuchet
git am $DRONE_WORKSPACE_BASE/fix-enable-more-grids-for-tablet.patch || git am --abort git am $DRONE_WORKSPACE_BASE/fix-enable-more-grids-for-tablet.patch || git am --abort
cd $TOPDIR cd $TOPDIR
cd packages/apps/Camera2
git am $DRONE_WORKSPACE_BASE/fix-camera2-legacy.patch || git am --abort
cd $TOPDIR
repopick -t twelve-colors -i -r repopick -t twelve-colors -i -r
cd frameworks/base cd frameworks/base
git reset --hard losul/lineage-19.1 git reset --hard losul/lineage-19.1
cd $TOPDIR cd $TOPDIR
repopick -P frameworks/base -r 336824 336825 336826 336827 336828 336829 336830 336831 336832 336833 336834 336835 336836 repopick -P frameworks/base -r 336824 336825 336826 336827 336828 336829 336830 336831 336832 336833 336834 336835 336836
cd $TOPDIR repopick -f 333534 -P system/core
repopick -f 329229 329230 -P frameworks/base
echo -e "# Build $(date '+%Y-%m-%d %H:%M:%S') UTC\n" >>"${changelog}" echo -e "# Build $(date '+%Y-%m-%d %H:%M:%S') UTC\n" >>"${changelog}"