diff --git a/buildbot_treble.sh b/buildbot_treble.sh index b6ce650..ec70f61 100755 --- a/buildbot_treble.sh +++ b/buildbot_treble.sh @@ -67,9 +67,18 @@ cd ../../.. cd external/tinycompress git revert 82c8fbf6d3fb0a017026b675adf2cee3f994e08a --no-edit # tinycompress: Use generated kernel headers cd ../.. +cd frameworks/native +git revert 581c22f979af05e48ad4843cdfa9605186d286da --no-edit # Add suspend_resume trace events to the atrace 'freq' category. +cd ../.. cd hardware/lineage/interfaces git am $BL/patches/0001-cryptfshw-Remove-dependency-on-generated-kernel-head.patch cd ../../.. +cd system/hardware/interfaces +git revert 5c145c49cc83bfe37c740bcfd3f82715ee051122 --no-edit # system_suspend: start early +cd ../../.. +cd system/sepolicy +git revert d12551bf1a6e8a9ece6bbb98344a27bde7f9b3e1 --no-edit # sepolicy: Relabel wifi. properties as wifi_prop +cd ../.. cd vendor/lineage git am $BL/patches/0001-build_soong-Disable-generated_kernel_headers.patch cd ../.. diff --git a/patches/0001-LineageParts-Invert-per-app-stretch-to-fullscreen.patch b/patches/0001-LineageParts-Invert-per-app-stretch-to-fullscreen.patch index bce9b43..f03bfb1 100644 --- a/patches/0001-LineageParts-Invert-per-app-stretch-to-fullscreen.patch +++ b/patches/0001-LineageParts-Invert-per-app-stretch-to-fullscreen.patch @@ -1,4 +1,4 @@ -From 2da980250f13f6bec288b921be1ad6a57549b1fc Mon Sep 17 00:00:00 2001 +From 47bf5612cec98931ee3076c307247ac58d07ccff Mon Sep 17 00:00:00 2001 From: AndyCGYan Date: Sun, 13 Jan 2019 21:44:48 +0800 Subject: [PATCH] LineageParts: Invert per-app stretch-to-fullscreen @@ -6,12 +6,12 @@ Subject: [PATCH] LineageParts: Invert per-app stretch-to-fullscreen Change-Id: Icb02c8dfd84882f736e37d6cd92c35e5eb288faa --- res/layout/long_screen_layout.xml | 2 +- - res/values-zh-rCN/strings.xml | 4 ++-- + res/values-zh-rCN/strings.xml | 6 +++--- res/values/strings.xml | 6 +++--- res/xml/long_screen_prefs.xml | 2 +- res/xml/parts_catalog.xml | 4 ++-- .../lineageparts/applications/LongScreenSettings.java | 2 +- - 6 files changed, 10 insertions(+), 10 deletions(-) + 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/res/layout/long_screen_layout.xml b/res/layout/long_screen_layout.xml index 40d0938..1119cef 100644 @@ -27,22 +27,24 @@ index 40d0938..1119cef 100644 android:visibility="gone" /> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml -index b518ff4..6ca9adb 100644 +index ee5f7f9..eeed571 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml -@@ -469,8 +469,8 @@ - 隐藏导航栏 - 同时隐藏 - 关闭开关以自定义您每个应用的扩展桌面 +@@ -448,9 +448,9 @@ + 电量 %s 时自动启用省电 + 不要自动启用省电 + 永不 - 全屏应用 - 强制旧式应用程序使用全屏长宽比 +- 无应用 + 禁用拉伸全屏 + 对选定的应用禁用拉伸全屏 ++ 无应用 充电提示音 启用 连接或断开电源时发出声音 diff --git a/res/values/strings.xml b/res/values/strings.xml -index 418b478..2ae06e7 100644 +index 65d799a..ff23ae9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -579,9 +579,9 @@ diff --git a/patches/0001-Squashed-revert-of-LOS-FOD-implementation.patch b/patches/0001-Squashed-revert-of-LOS-FOD-implementation.patch index 76c4ae3..c6ace61 100644 --- a/patches/0001-Squashed-revert-of-LOS-FOD-implementation.patch +++ b/patches/0001-Squashed-revert-of-LOS-FOD-implementation.patch @@ -1,4 +1,4 @@ -From 16b05029ca5f14a5c881eccfc57f07738fc64d8a Mon Sep 17 00:00:00 2001 +From 171f155e6519497027676482483b530305d21cd9 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 5 Feb 2020 02:24:44 +0000 Subject: [PATCH] Squashed revert of LOS FOD implementation @@ -13,14 +13,14 @@ Change-Id: Ifbcd5ff44c97e536fd2e417deadc2b08773b7b5e .../res/drawable/fod_icon_default.xml | 25 - packages/SystemUI/res/values/config.xml | 1 - .../SystemUI/res/values/lineage_config.xml | 4 - - .../systemui/biometrics/FODCircleView.java | 430 ------------------ + .../systemui/biometrics/FODCircleView.java | 454 ------------------ .../biometrics/FODCircleViewImpl.java | 62 --- .../systemui/statusbar/CommandQueue.java | 28 -- services/core/Android.bp | 1 - .../biometrics/BiometricServiceBase.java | 2 +- .../fingerprint/FingerprintService.java | 112 ----- .../statusbar/StatusBarManagerService.java | 22 - - 13 files changed, 1 insertion(+), 694 deletions(-) + 13 files changed, 1 insertion(+), 718 deletions(-) delete mode 100644 packages/SystemUI/res/drawable/fod_icon_default.xml delete mode 100644 packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java delete mode 100644 packages/SystemUI/src/com/android/systemui/biometrics/FODCircleViewImpl.java @@ -54,7 +54,7 @@ index d1d44d1ad60..07b0c6eecdf 100644 void setBlockedGesturalNavigation(boolean blocked); } diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp -index 99f2e5b7301..7f5f9cb8ae7 100644 +index d17fe0ac339..7d5a4bbe467 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -65,7 +65,6 @@ android_library { @@ -62,10 +62,10 @@ index 99f2e5b7301..7f5f9cb8ae7 100644 "jsr330", "org.lineageos.platform.internal", - "vendor.lineage.biometrics.fingerprint.inscreen-V1.0-java", + "vendor.lineage.powershare-V1.0-java", ], manifest: "AndroidManifest.xml", - additional_manifests: ["LineageManifest.xml"], -@@ -124,7 +123,6 @@ android_library { +@@ -125,7 +124,6 @@ android_library { "dagger2-2.19", "jsr330", "org.lineageos.platform.internal", @@ -105,7 +105,7 @@ index 38e9d311128..00000000000 - 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" /> - diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml -index 82b6932e5b0..2d794c0aa99 100644 +index 13a0ec2b5ab..139906a2641 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -292,7 +292,6 @@ @@ -133,10 +133,10 @@ index fd732a7127a..e520306aa78 100644 5 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 0af62b731b9..00000000000 +index 6be2fef143d..00000000000 --- a/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java +++ /dev/null -@@ -1,430 +0,0 @@ +@@ -1,454 +0,0 @@ -/** - * Copyright (C) 2019 The Android Open Source Project - * @@ -155,6 +155,7 @@ index 0af62b731b9..00000000000 - -package com.android.systemui.biometrics; - +-import android.app.admin.DevicePolicyManager; -import android.content.Context; -import android.content.res.Configuration; -import android.content.res.Resources; @@ -175,6 +176,8 @@ index 0af62b731b9..00000000000 -import android.view.WindowManager; -import android.widget.ImageView; - +-import com.android.internal.widget.LockPatternUtils; +-import com.android.keyguard.KeyguardSecurityModel.SecurityMode; -import com.android.keyguard.KeyguardUpdateMonitor; -import com.android.keyguard.KeyguardUpdateMonitorCallback; -import com.android.systemui.R; @@ -214,6 +217,8 @@ index 0af62b731b9..00000000000 - - private Handler mHandler; - +- private LockPatternUtils mLockPatternUtils; +- - private Timer mBurnInProtectionTimer; - - private IFingerprintInscreenCallback mFingerprintInscreenCallback = @@ -248,11 +253,14 @@ index 0af62b731b9..00000000000 - @Override - public void onKeyguardBouncerChanged(boolean isBouncer) { - mIsBouncer = isBouncer; -- -- if (isBouncer) { +- if (mUpdateMonitor.isFingerprintDetectionRunning()) { +- if (isPinOrPattern(mUpdateMonitor.getCurrentUser()) || !isBouncer) { +- show(); +- } else { +- hide(); +- } +- } else { - hide(); -- } else if (mUpdateMonitor.isFingerprintDetectionRunning()) { -- show(); - } - } - @@ -321,6 +329,8 @@ index 0af62b731b9..00000000000 - updatePosition(); - hide(); - +- mLockPatternUtils = new LockPatternUtils(mContext); +- - mUpdateMonitor = KeyguardUpdateMonitor.getInstance(context); - mUpdateMonitor.registerCallback(mMonitorCallback); - @@ -453,8 +463,8 @@ index 0af62b731b9..00000000000 - return; - } - -- if (mIsBouncer) { -- // Ignore show calls when Keyguard pin screen is being shown +- if (mIsBouncer && !isPinOrPattern(mUpdateMonitor.getCurrentUser())) { +- // Ignore show calls when Keyguard password screen is being shown - return; - } - @@ -544,6 +554,20 @@ index 0af62b731b9..00000000000 - mWindowManager.updateViewLayout(this, mParams); - } - +- private boolean isPinOrPattern(int userId) { +- int passwordQuality = mLockPatternUtils.getActivePasswordQuality(userId); +- switch (passwordQuality) { +- // PIN +- case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC: +- case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX: +- // Pattern +- case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: +- return true; +- } +- +- return false; +- } +- - private class BurnInProtectionTask extends TimerTask { - @Override - public void run() { diff --git a/patches/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch b/patches/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch index 16323dd..423e36e 100644 --- a/patches/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch +++ b/patches/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch @@ -1,4 +1,4 @@ -From 06ddcd3f6403ad8c76ebf3ace73ef7ebfc8b902d Mon Sep 17 00:00:00 2001 +From 7a633a53d8e20e2d976597a332bf5ba855ec1f75 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 5 Sep 2019 02:08:22 +0000 Subject: [PATCH] vendor_lineage: Log privapp-permissions whitelist violations @@ -10,12 +10,12 @@ Change-Id: I49dba61f332253e291a65e79ca70d9a07d45bb07 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/common.mk b/config/common.mk -index 2be6dfff..79792b13 100644 +index 2fe9cb01..7d971bba 100644 --- a/config/common.mk +++ b/config/common.mk -@@ -87,9 +87,9 @@ PRODUCT_COPY_FILES += \ - vendor/lineage/config/permissions/privapp-permissions-lineage-product.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-lineage.xml \ - vendor/lineage/config/permissions/privapp-permissions-cm-legacy.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-cm-legacy.xml +@@ -70,9 +70,9 @@ PRODUCT_COPY_FILES += \ + PRODUCT_COPY_FILES += \ + vendor/lineage/config/permissions/org.lineageos.android.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.android.xml -# Enforce privapp-permissions whitelist +# Log privapp-permissions whitelist violations @@ -23,8 +23,8 @@ index 2be6dfff..79792b13 100644 - ro.control_privapp_permissions=enforce + ro.control_privapp_permissions=log - # Hidden API whitelist - PRODUCT_COPY_FILES += \ + # Include AOSP audio files + include vendor/lineage/config/aosp_audio.mk -- 2.17.1