Skip to content
This repository was archived by the owner on Dec 12, 2023. It is now read-only.

Commit 4e630b4

Browse files
committed
feat: Sync with latest sources of TrebleDroid and Pixel Experience (ci-20230507,ci-20230510,ci-20230518,ci-20230527,ci-20230528,ci-20230531,ci-20230608,ci-20230614)
1 parent e8d2416 commit 4e630b4

File tree

138 files changed

+63909
-502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+63909
-502
lines changed

manifest.xml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<manifest>
3-
<project path="device/generic/common" name="device/generic/common" groups="pdk" />
43
<project name="TrebleDroid/device_phh_treble" path="device/phh/treble" remote="github" revision="android-13.0" />
54
<project name="TrebleDroid/vendor_hardware_overlay" path="vendor/hardware_overlay" remote="github" revision="pie" />
65
<project name="TrebleDroid/vendor_interfaces" path="vendor/interfaces" remote="github" revision="android-13.0" />

patches/personal/device_phh_treble/0001-Rework-securize-tweak.patch

+12-18
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
From ab391255baeac3660c9eb6f0556bf897669c7246 Mon Sep 17 00:00:00 2001
1+
From 2975460eef8a8f76ca1598b68cbc23d1d0f67a2c Mon Sep 17 00:00:00 2001
22
From: Alberto Ponces <[email protected]>
33
Date: Wed, 25 Dec 2019 12:34:05 +0200
44
Subject: [PATCH 1/3] Rework securize tweak
55

66
---
77
base.mk | 1 -
8-
rw-system.sh | 54 ++++++++++++++++++++++++++++++----------------------
9-
2 files changed, 32 insertions(+), 23 deletions(-)
8+
rw-system.sh | 49 ++++++++++++++++++++++++++++++-------------------
9+
2 files changed, 30 insertions(+), 20 deletions(-)
1010

1111
diff --git a/base.mk b/base.mk
12-
index d9c3ca6..b809100 100644
12+
index b9298a2..32a797f 100644
1313
--- a/base.mk
1414
+++ b/base.mk
15-
@@ -158,7 +158,6 @@ PRODUCT_PACKAGES += \
15+
@@ -180,7 +180,6 @@ PRODUCT_PACKAGES += \
1616
resetprop_phh
1717

1818
PRODUCT_COPY_FILES += \
@@ -21,10 +21,10 @@ index d9c3ca6..b809100 100644
2121

2222
PRODUCT_COPY_FILES += \
2323
diff --git a/rw-system.sh b/rw-system.sh
24-
index 5bfa270..5406110 100644
24+
index 9a90a29..f178bd1 100644
2525
--- a/rw-system.sh
2626
+++ b/rw-system.sh
27-
@@ -701,35 +701,59 @@ copyprop() {
27+
@@ -739,32 +739,59 @@ copyprop() {
2828
resetprop_phh "$1" "$(getprop "$2")"
2929
fi
3030
}
@@ -84,19 +84,13 @@ index 5bfa270..5406110 100644
8484
+ copyprop ro.product.system.manufacturer ro.product.vendor.manufacturer
8585
+ copyprop ro.product.product.manufacturer ro.product.vendor.manufacturer
8686
+ copyprop ro.product.system_ext.manufacturer ro.product.vendor.manufacturer
87-
- (getprop ro.vendor.build.security_patch; getprop ro.keymaster.xxx.security_patch) |sort |tail -n 1 |while read v;do
88-
- [ -n "$v" ] && resetprop_phh ro.build.version.security_patch "$v"
89-
- done
87+
(getprop ro.vendor.build.security_patch; getprop ro.keymaster.xxx.security_patch) |sort |tail -n 1 |while read v;do
88+
[ -n "$v" ] && resetprop_phh ro.build.version.security_patch "$v"
89+
done
90+
@@ -783,22 +810,6 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
9091

91-
resetprop_phh ro.build.tags release-keys
92-
resetprop_phh ro.boot.vbmeta.device_state locked
93-
@@ -743,25 +767,6 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
94-
resetprop_phh ro.build.type user
95-
resetprop_phh ro.build.selinux 0
92+
resetprop_phh ro.adb.secure 1
9693

97-
- resetprop_phh ro.adb.secure 1
98-
- setprop ctl.restart adbd
99-
-
10094
- # Hide system/xbin/su
10195
- mount /mnt/phh/empty_dir /system/xbin
10296
- mount /mnt/phh/empty_dir /system/app/me.phh.superuser

patches/trebledroid/platform_frameworks_base/0017-Make-rounded-corners-padding-overridable-with-persis.patch patches/personal/platform_frameworks_base/0001-Make-rounded-corners-padding-overridable-with-persis.patch

+3-29
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,15 @@
1-
From 84e83612c6b8ff0b8590d0f8309e9e32fa535b10 Mon Sep 17 00:00:00 2001
1+
From 780d66240e6de18aeadfa53e42d790fa5e74619c Mon Sep 17 00:00:00 2001
22
From: Pierre-Hugues Husson <[email protected]>
33
Date: Sun, 6 Dec 2020 12:20:08 +0100
4-
Subject: [PATCH 17/39] Make rounded corners padding overridable with
4+
Subject: [PATCH] Make rounded corners padding overridable with
55
persist.sys.phh.rounded_corners_padding
66

77
Change-Id: I481c1c8849b2f22a7cdfb2896a6d3c2e7e3b44d9
88
---
9-
.../src/com/android/systemui/qs/QuickStatusBarHeader.java | 7 +++++--
109
.../systemui/statusbar/phone/KeyguardStatusBarView.java | 7 +++++--
1110
.../statusbar/phone/StatusBarContentInsetsProvider.kt | 5 ++++-
12-
3 files changed, 14 insertions(+), 5 deletions(-)
11+
2 files changed, 9 insertions(+), 3 deletions(-)
1312

14-
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
15-
index 946fe542741f..c600468bb488 100644
16-
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
17-
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
18-
@@ -22,6 +22,7 @@ import android.content.res.Configuration;
19-
import android.content.res.Resources;
20-
import android.graphics.Color;
21-
import android.graphics.Rect;
22-
+import android.os.SystemProperties;
23-
import android.util.AttributeSet;
24-
import android.util.Pair;
25-
import android.view.DisplayCutout;
26-
@@ -253,8 +254,10 @@ public class QuickStatusBarHeader extends FrameLayout {
27-
28-
mConfigShowBatteryEstimate = resources.getBoolean(R.bool.config_showBatteryEstimateQSBH);
29-
30-
- mRoundedCornerPadding = resources.getDimensionPixelSize(
31-
- R.dimen.rounded_corner_content_padding);
32-
+ mRoundedCornerPadding = SystemProperties.getInt("persist.sys.phh.rounded_corners_padding", -1);
33-
+ if(mRoundedCornerPadding == -1)
34-
+ mRoundedCornerPadding = resources.getDimensionPixelSize(
35-
+ R.dimen.rounded_corner_content_padding);
36-
37-
int statusBarHeight = SystemBarUtils.getStatusBarHeight(mContext);
38-
3913
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
4014
index 13566ef8c630..58af9e36bfc9 100644
4115
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java

patches/personal/platform_system_sepolicy/0001-Fix-sepolicy-for-offline-charging-EMUI9-kirin.patch

-46
This file was deleted.

0 commit comments

Comments
 (0)