Changes for May 2023, syncing up to 20230429

This commit is contained in:
Andy CrossGate Yan 2023-05-07 14:42:57 +00:00
parent 148c5438de
commit 3a82192c9d
38 changed files with 103977 additions and 102010 deletions

View File

@ -0,0 +1,156 @@
From 7ee7d93a6596567c0b799ba00091db3950b83fe0 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 7 May 2023 14:24:32 +0000
Subject: [PATCH 2/5] Revert "DeskClock: update digital widget"
This reverts commit a9e6a18d1abd5f3ee2ec816d031f2a69ea1f6028.
---
res/layout/digital_widget.xml | 5 +++--
res/layout/digital_widget_sizer.xml | 5 +++--
res/values-h560dp/dimens.xml | 2 +-
res/values-h650dp/dimens.xml | 2 +-
res/values-sw600dp-land/dimens.xml | 2 +-
res/values-sw600dp/dimens.xml | 2 +-
res/values-sw720dp/dimens.xml | 2 +-
res/values/dimens.xml | 2 +-
res/values/styles.xml | 6 ++----
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/res/layout/digital_widget.xml b/res/layout/digital_widget.xml
index d09cba64c..5cf896a84 100644
--- a/res/layout/digital_widget.xml
+++ b/res/layout/digital_widget.xml
@@ -24,7 +24,7 @@
<TextClock
android:id="@+id/clock"
- style="@style/widget_big"
+ style="@style/widget_big_thin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
@@ -32,7 +32,8 @@
android:format12Hour="@string/lock_screen_12_hour_format"
android:format24Hour="@string/lock_screen_24_hour_format"
android:includeFontPadding="false"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:textColor="@color/white" />
<LinearLayout
android:layout_width="wrap_content"
diff --git a/res/layout/digital_widget_sizer.xml b/res/layout/digital_widget_sizer.xml
index be7677ba7..f524cf536 100644
--- a/res/layout/digital_widget_sizer.xml
+++ b/res/layout/digital_widget_sizer.xml
@@ -21,7 +21,7 @@
<TextClock
android:id="@+id/clock"
- style="@style/widget_big"
+ style="@style/widget_big_thin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
@@ -29,7 +29,8 @@
android:ellipsize="none"
android:format12Hour="@string/lock_screen_12_hour_format"
android:format24Hour="@string/lock_screen_24_hour_format"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:textColor="@color/white" />
<LinearLayout
android:layout_width="wrap_content"
diff --git a/res/values-h560dp/dimens.xml b/res/values-h560dp/dimens.xml
index 403e19f93..7bf0909b1 100644
--- a/res/values-h560dp/dimens.xml
+++ b/res/values-h560dp/dimens.xml
@@ -16,5 +16,5 @@
<resources>
<!-- The maximum size of the font for the time in widgets. -->
- <dimen name="widget_max_clock_font_size">86dp</dimen>
+ <dimen name="widget_max_clock_font_size">96dp</dimen>
</resources>
diff --git a/res/values-h650dp/dimens.xml b/res/values-h650dp/dimens.xml
index de043fd26..7c52196c0 100644
--- a/res/values-h650dp/dimens.xml
+++ b/res/values-h650dp/dimens.xml
@@ -16,5 +16,5 @@
<resources>
<!-- The maximum size of the font for the time in widgets. -->
- <dimen name="widget_max_clock_font_size">90dp</dimen>
+ <dimen name="widget_max_clock_font_size">100dp</dimen>
</resources>
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index f647ef5b4..157e8b4ba 100644
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -24,5 +24,5 @@
<dimen name="analog_clock_margin">48dp</dimen>
<!-- The maximum size of the font for the time in widgets. -->
- <dimen name="widget_max_clock_font_size">90dp</dimen>
+ <dimen name="widget_max_clock_font_size">100dp</dimen>
</resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index bde6b225c..2c3a50de6 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -63,5 +63,5 @@
<!-- The fixed size of the font for the city name / day of week in the city widget. -->
<dimen name="city_widget_name_font_size">20dp</dimen>
<!-- The maximum size of the font for the time in widgets. -->
- <dimen name="widget_max_clock_font_size">112dp</dimen>
+ <dimen name="widget_max_clock_font_size">125dp</dimen>
</resources>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 8b786f0e9..92f495a76 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -22,5 +22,5 @@
<dimen name="analog_clock_size">312dp</dimen>
<!-- The maximum size of the font for the time in widgets. -->
- <dimen name="widget_max_clock_font_size">124dp</dimen>
+ <dimen name="widget_max_clock_font_size">138dp</dimen>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c26d93ddd..c136fe25a 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -95,7 +95,7 @@
<!-- The fixed size of the font for the city name / day of week in the city widget. -->
<dimen name="city_widget_name_font_size">10dp</dimen>
<!-- The maximum size of the font for the time in widgets. -->
- <dimen name="widget_max_clock_font_size">80dp</dimen>
+ <dimen name="widget_max_clock_font_size">88dp</dimen>
<dimen name="widget_min_world_city_list_size">80dp</dimen>
<!-- shadow styles for widget text with drop shadows -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 683df4ee5..8c6364344 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -72,14 +72,12 @@
<item name="android:fontFamily">sans-serif-thin</item>
</style>
- <style name="widget_big" parent="big_thin">
+ <style name="widget_big_thin" parent="big_thin">
<item name="android:shadowRadius">@dimen/widget_shadow_radius</item>
<item name="android:shadowColor">@color/widget_shadow_color</item>
<item name="android:shadowDx">@dimen/widget_shadow_dx</item>
<item name="android:shadowDy">@dimen/widget_shadow_dy</item>
- <item name="android:fontFamily">sans-serif-condensed</item>
- <item name="android:textColor">@*android:color/system_accent2_100</item>
- <item name="android:scaleY">0.9</item>
+ <item name="android:fontFamily">sans-serif-thin</item>
</style>
<style name="PrimaryLabelTextParentAppearance">
--
2.34.1

View File

@ -1,7 +1,7 @@
From 093cc22ff7034256909c702288c94f99fb377671 Mon Sep 17 00:00:00 2001 From 8ffb863199ed6e09068a41aa8e701732bed271e6 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 5 Sep 2021 00:30:33 +0000 Date: Sun, 5 Sep 2021 00:30:33 +0000
Subject: [PATCH 1/3] DeskClock: Remove night mode Subject: [PATCH 3/5] DeskClock: Remove night mode
Change-Id: I885f39027e78fcda397f1be59d17bc24bc66671a Change-Id: I885f39027e78fcda397f1be59d17bc24bc66671a
--- ---
@ -55,5 +55,5 @@ index b30f82ee7..90235351f 100644
mContentView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE mContentView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE
-- --
2.25.1 2.34.1

View File

@ -1,7 +1,7 @@
From c14821c4defd8da1f49ddc1a64875967166a277b Mon Sep 17 00:00:00 2001 From acb86d43b61a02dbad16bd56a2a0bc3f770b46f9 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 19 Jan 2022 18:04:36 +0000 Date: Wed, 19 Jan 2022 18:04:36 +0000
Subject: [PATCH 2/3] DeskClock: Adapt digital clocks to S style Subject: [PATCH 4/5] DeskClock: Adapt digital clocks to S style
Lollipop is so yesterday... Lollipop is so yesterday...
Bring the layouts of various digital clocks (app, widget, daydream) Bring the layouts of various digital clocks (app, widget, daydream)
@ -568,7 +568,7 @@ index bf53584e4..7a0e3ae0b 100644
} }
} }
diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java
index 7da7b15f4..48ea85041 100644 index 4eea6beba..4a5ad5a0a 100644
--- a/src/com/android/deskclock/Utils.java --- a/src/com/android/deskclock/Utils.java
+++ b/src/com/android/deskclock/Utils.java +++ b/src/com/android/deskclock/Utils.java
@@ -52,9 +52,7 @@ import android.text.style.RelativeSizeSpan; @@ -52,9 +52,7 @@ import android.text.style.RelativeSizeSpan;
@ -581,7 +581,7 @@ index 7da7b15f4..48ea85041 100644
import android.widget.TextClock; import android.widget.TextClock;
import android.widget.TextView; import android.widget.TextView;
@@ -300,23 +298,6 @@ public class Utils { @@ -302,23 +300,6 @@ public class Utils {
dateDisplay.setContentDescription(new SimpleDateFormat(descriptionPattern, l).format(now)); dateDisplay.setContentDescription(new SimpleDateFormat(descriptionPattern, l).format(now));
} }
@ -606,5 +606,5 @@ index 7da7b15f4..48ea85041 100644
* Formats the time in the TextClock according to the Locale with a special * Formats the time in the TextClock according to the Locale with a special
* formatting treatment for the am/pm label. * formatting treatment for the am/pm label.
-- --
2.25.1 2.34.1

View File

@ -1,7 +1,7 @@
From d45263d0b73030ddb4a769038aaa96c5ef0ba49c Mon Sep 17 00:00:00 2001 From cb345f3431711b6df77eadfe88cee2101d34bea3 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 20 Jan 2022 04:42:03 +0000 Date: Thu, 20 Jan 2022 04:42:03 +0000
Subject: [PATCH 3/3] DeskClock: Wallpaper-based text coloring for digital Subject: [PATCH 5/5] DeskClock: Wallpaper-based text coloring for digital
clock widget clock widget
RemoteViews is such a restrictive PITA RemoteViews is such a restrictive PITA
@ -114,5 +114,5 @@ index fb1b30aa7..c04528240 100644
final int widthSize = View.MeasureSpec.getSize(measuredSizes.mTargetWidthPx); final int widthSize = View.MeasureSpec.getSize(measuredSizes.mTargetWidthPx);
final int heightSize = View.MeasureSpec.getSize(measuredSizes.mTargetHeightPx); final int heightSize = View.MeasureSpec.getSize(measuredSizes.mTargetHeightPx);
-- --
2.25.1 2.34.1

View File

@ -1,4 +1,4 @@
From 9dceb9dcaa424c2b9bdeacef6c1b60f055a464f6 Mon Sep 17 00:00:00 2001 From 863e8f70e3a4f987938ff4ad01c22822bc38e409 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 20 Jun 2021 09:09:15 +0000 Date: Sun, 20 Jun 2021 09:09:15 +0000
Subject: [PATCH 1/4] build: Integrate prop modifications (2/2) Subject: [PATCH 1/4] build: Integrate prop modifications (2/2)
@ -32,5 +32,5 @@ index 28044e2c..c5aa9617 100644
ADDITIONAL_SYSTEM_PROPERTIES += \ ADDITIONAL_SYSTEM_PROPERTIES += \
ro.lineage.build.version.plat.sdk=$(LINEAGE_PLATFORM_SDK_VERSION) ro.lineage.build.version.plat.sdk=$(LINEAGE_PLATFORM_SDK_VERSION)
-- --
2.25.1 2.34.1

View File

@ -1,4 +1,4 @@
From 17d460d416fa4a721adb183b8ac445372543f5b9 Mon Sep 17 00:00:00 2001 From 34f8aa093286970f82014f1dae0e86e4cbeba896 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 16 Oct 2021 00:41:07 +0000 Date: Sat, 16 Oct 2021 00:41:07 +0000
Subject: [PATCH 2/4] build: Remove Stk (2/2) Subject: [PATCH 2/4] build: Remove Stk (2/2)
@ -36,5 +36,5 @@ index 6adf48d9..e63b320d 100644
# Default ringtone # Default ringtone
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
-- --
2.25.1 2.34.1

View File

@ -1,4 +1,4 @@
From 6819a636e91927acd6c72586f21fcdd749330ad8 Mon Sep 17 00:00:00 2001 From 84b5b23519166701423a324cac955e9110e36eae Mon Sep 17 00:00:00 2001
From: AndyCGYan <GeForce8800Ultra@gmail.com> From: AndyCGYan <GeForce8800Ultra@gmail.com>
Date: Mon, 1 Jul 2019 07:03:04 +0000 Date: Mon, 1 Jul 2019 07:03:04 +0000
Subject: [PATCH 3/4] vendor_lineage: Ignore neverallows... again Subject: [PATCH 3/4] vendor_lineage: Ignore neverallows... again
@ -26,5 +26,5 @@ index f2e595ff..d6d036a9 100644
# Rules for QCOM targets # Rules for QCOM targets
include $(TOPDIR)vendor/lineage/build/core/qcom_target.mk include $(TOPDIR)vendor/lineage/build/core/qcom_target.mk
-- --
2.25.1 2.34.1

View File

@ -1,4 +1,4 @@
From 91e15e1471b936462709906efaba8f53fef899f8 Mon Sep 17 00:00:00 2001 From 05700475543c1dece33a8f49bcb84d5b709a3164 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 9 Apr 2022 02:48:55 +0000 Date: Sat, 9 Apr 2022 02:48:55 +0000
Subject: [PATCH 4/4] vendor_lineage: Personal theme as SRO Subject: [PATCH 4/4] vendor_lineage: Personal theme as SRO
@ -159,7 +159,7 @@ Change-Id: I43164b7a4145616d162c6b4b4b84d1953cb483cc
create mode 100644 overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_foreground.xml create mode 100644 overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_foreground.xml
diff --git a/config/common.mk b/config/common.mk diff --git a/config/common.mk b/config/common.mk
index f5c6ce06..dcf8b79f 100644 index 70e0cbaf..4da11943 100644
--- a/config/common.mk --- a/config/common.mk
+++ b/config/common.mk +++ b/config/common.mk
@@ -189,10 +189,13 @@ PRODUCT_DEXPREOPT_SPEED_APPS += \ @@ -189,10 +189,13 @@ PRODUCT_DEXPREOPT_SPEED_APPS += \
@ -177,7 +177,7 @@ index f5c6ce06..dcf8b79f 100644
+ vendor/lineage/overlay/personal + vendor/lineage/overlay/personal
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NetworkStackOverlay \ DocumentsUIOverlay \
diff --git a/overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644 new file mode 100644
index 00000000..db946c4e index 00000000..db946c4e
@ -2238,5 +2238,5 @@ index 00000000..4e86fe3d
+ </group> + </group>
+</vector> +</vector>
-- --
2.25.1 2.34.1

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
From 3077fc174258024c587dd0387db26d3a711d64d4 Mon Sep 17 00:00:00 2001 From 30f63b6a34c43294b71b06066c7592c640485d6c Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 14 Aug 2019 23:37:10 +0200 Date: Wed, 14 Aug 2019 23:37:10 +0200
Subject: [PATCH 01/10] On Samsung, we need to send a hack-message to HAL to Subject: [PATCH 01/11] On Samsung, we need to send a hack-message to HAL to
get all Sensors get all Sensors
Change-Id: Id6a1fa48340de61c418493668e9abd22c2599376 Change-Id: Id6a1fa48340de61c418493668e9abd22c2599376

View File

@ -1,7 +1,7 @@
From 8401967290b4c359ad06555cf728b9430ea62db0 Mon Sep 17 00:00:00 2001 From c95bc2642cb6dcb675e09035e3b8801bc7912d67 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 22 Oct 2020 23:22:46 +0200 Date: Thu, 22 Oct 2020 23:22:46 +0200
Subject: [PATCH 02/10] Matching an input with a display uses uniqueId Subject: [PATCH 02/11] Matching an input with a display uses uniqueId
Not all devices have a `location`, notably bluetooth devices. Not all devices have a `location`, notably bluetooth devices.
However, we might still want to associate them with a screen, However, we might still want to associate them with a screen,

View File

@ -1,7 +1,7 @@
From 632fa6e7f4491d8adecc13d2a68d0d3a4d0720ba Mon Sep 17 00:00:00 2001 From 87f585a3bfc96c95c585021fcb6ed06fbc18cfee Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 5 Jan 2021 23:44:00 +0100 Date: Tue, 5 Jan 2021 23:44:00 +0100
Subject: [PATCH 03/10] unshared_oob didn't exist in O/P, so detect its Subject: [PATCH 03/11] unshared_oob didn't exist in O/P, so detect its
supported based on vndk version supported based on vndk version
--- ---

View File

@ -1,7 +1,7 @@
From c99eb09fe299a4efc5d548997dcc49ba95af3a9c Mon Sep 17 00:00:00 2001 From 203e9fa87950fae83214c7a5762e217e1b56979f Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 31 Mar 2021 23:36:03 +0200 Date: Wed, 31 Mar 2021 23:36:03 +0200
Subject: [PATCH 04/10] Remove Samsung system permission on sensors Subject: [PATCH 04/11] Remove Samsung system permission on sensors
--- ---
libs/sensor/Sensor.cpp | 1 + libs/sensor/Sensor.cpp | 1 +

View File

@ -1,7 +1,7 @@
From ca3f41f26fdf3c5584b15514de9ddd0ed22676b8 Mon Sep 17 00:00:00 2001 From 9aec0884fff527a97f08a930112e0e9ca5324161 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 12 Dec 2021 08:45:36 -0500 Date: Sun, 12 Dec 2021 08:45:36 -0500
Subject: [PATCH 05/10] Mark accelerometer input as sensor exclusively if there Subject: [PATCH 05/11] Mark accelerometer input as sensor exclusively if there
are ABS axis are ABS axis
The reason this is needed is that on -fucked up- Xiami Mi A2 Lite and The reason this is needed is that on -fucked up- Xiami Mi A2 Lite and

View File

@ -1,7 +1,7 @@
From 6ecf751917dccb4a2fca63cca9b18d478c0c85d0 Mon Sep 17 00:00:00 2001 From 8f8b2ca55f0b030692aba1db4a36c98ecce03a62 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 27 Dec 2021 18:00:43 -0500 Date: Mon, 27 Dec 2021 18:00:43 -0500
Subject: [PATCH 06/10] powermanager: Add support Samsung miscpower HAL Subject: [PATCH 06/11] powermanager: Add support Samsung miscpower HAL
Several various configurations need to be supported: Several various configurations need to be supported:
- Android Pie vendors have a android.hardware.power HIDL default + "miscpower" - Android Pie vendors have a android.hardware.power HIDL default + "miscpower"

View File

@ -1,7 +1,7 @@
From 9afa49a7f8ea8fb5a7af10089a8276b35ecf194e Mon Sep 17 00:00:00 2001 From ed7cb34a01b44348feb2ff81d7ffb6fdf8faa5ce Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 12 Jan 2022 04:07:34 -0500 Date: Wed, 12 Jan 2022 04:07:34 -0500
Subject: [PATCH 07/10] Fix loading power hidl v1.0 Subject: [PATCH 07/11] Fix loading power hidl v1.0
Change-Id: Ife20a98d2a11c79c7b42f359f30c28e2dede1f25 Change-Id: Ife20a98d2a11c79c7b42f359f30c28e2dede1f25
--- ---

View File

@ -1,7 +1,7 @@
From 7ddec0245af245006aecf1de2686ae03c4058b86 Mon Sep 17 00:00:00 2001 From 48575bfacb379944f3796958287f2ab1410d4cd1 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 25 Mar 2022 05:37:56 -0400 Date: Fri, 25 Mar 2022 05:37:56 -0400
Subject: [PATCH 08/10] MIUI13 devices hide their vibrator HAL behind Subject: [PATCH 08/11] MIUI13 devices hide their vibrator HAL behind
non-default name: "vibratorfeature" non-default name: "vibratorfeature"
--- ---

View File

@ -1,7 +1,7 @@
From 4333b98463bc73ca513e4916c025fa56c97a964a Mon Sep 17 00:00:00 2001 From a3c1b022989d468e32821ed9933857de7c0c1bea Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 18 Dec 2022 18:17:30 -0500 Date: Sun, 18 Dec 2022 18:17:30 -0500
Subject: [PATCH 09/10] FOD support for Samsung and Asus Subject: [PATCH 09/11] FOD support for Samsung and Asus
--- ---
libs/gui/BLASTBufferQueue.cpp | 20 ++++++++++++++-- libs/gui/BLASTBufferQueue.cpp | 20 ++++++++++++++--

View File

@ -1,7 +1,7 @@
From 461cc58b47900e2e3241dd8eb83d5eb15ddb1120 Mon Sep 17 00:00:00 2001 From 70bff60fcd94ac2e4585e4ac69b301ee05d3d00d Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 20 Oct 2021 09:39:47 -0400 Date: Wed, 20 Oct 2021 09:39:47 -0400
Subject: [PATCH 10/10] Try to fallback mCallingSid to getpidcon Subject: [PATCH 10/11] Try to fallback mCallingSid to getpidcon
This is needed because old vendors (before April 2019 ~) don't support This is needed because old vendors (before April 2019 ~) don't support
reporting SELinux context of the caller. reporting SELinux context of the caller.

View File

@ -0,0 +1,36 @@
From b46f222a169c4d27f9b5470a252ccecc5d63a2d2 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 18 Apr 2023 23:48:15 +0000
Subject: [PATCH 11/11] Fix light sensor crash on Xiaomi 13
SensorService expects a scalar, but Xiaomi HAL returns a pose6DOF vector encapsulation
Thanks @phhusson for the analysis
Change-Id: Ie358321d5328d01541f455d6af86944ff413c9c9
---
services/sensorservice/AidlSensorHalWrapper.cpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/services/sensorservice/AidlSensorHalWrapper.cpp b/services/sensorservice/AidlSensorHalWrapper.cpp
index f67c610550..32fd9240b3 100644
--- a/services/sensorservice/AidlSensorHalWrapper.cpp
+++ b/services/sensorservice/AidlSensorHalWrapper.cpp
@@ -171,7 +171,14 @@ void convertToSensorEvent(const Event &src, sensors_event_t *dst) {
case SensorType::MOTION_DETECT:
case SensorType::HEART_BEAT:
case SensorType::LOW_LATENCY_OFFBODY_DETECT: {
- dst->data[0] = src.payload.get<Event::EventPayload::scalar>();
+ if (src.payload.getTag() == Event::EventPayload::pose6DOF) {
+ auto d = src.payload.get<Event::EventPayload::pose6DOF>();
+ auto dstr = ::android::internal::ToString(d);
+ // ALOGE("Received 6DOF for expected scalar %s", dstr.c_str());
+ dst->data[0] = d.values[0];
+ } else {
+ dst->data[0] = src.payload.get<Event::EventPayload::scalar>();
+ }
break;
}
--
2.34.1

View File

@ -1,7 +1,7 @@
From 71162b2f1912d5c4cf628d225194dabeac51b86c Mon Sep 17 00:00:00 2001 From ac48adab4937cf7f58ca773ca71e681f7775bd43 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 23 Feb 2022 17:37:47 -0500 Date: Wed, 23 Feb 2022 17:37:47 -0500
Subject: [PATCH 01/15] Let system override ro.apex.updatable Subject: [PATCH 01/16] Let system override ro.apex.updatable
APEX are broken because of a kernel bug in Android 10 devices APEX are broken because of a kernel bug in Android 10 devices
So we have system set ro.apex.updatable = false So we have system set ro.apex.updatable = false
@ -13,7 +13,7 @@ So, ignore the override policy for this prop
1 file changed, 6 insertions(+), 2 deletions(-) 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/init/property_service.cpp b/init/property_service.cpp diff --git a/init/property_service.cpp b/init/property_service.cpp
index f14023f32..02fb8049b 100644 index 7fd64b389..af7abe643 100644
--- a/init/property_service.cpp --- a/init/property_service.cpp
+++ b/init/property_service.cpp +++ b/init/property_service.cpp
@@ -727,8 +727,12 @@ static void LoadProperties(char* data, const char* filter, const char* filename, @@ -727,8 +727,12 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
@ -32,5 +32,5 @@ index f14023f32..02fb8049b 100644
LOG(ERROR) << "Do not have permissions to set '" << key << "' to '" << value LOG(ERROR) << "Do not have permissions to set '" << key << "' to '" << value
<< "' in property file '" << filename << "': " << error; << "' in property file '" << filename << "': " << error;
-- --
2.25.1 2.34.1

View File

@ -1,7 +1,7 @@
From 3533e6d12361de6cc0a5b93a2a96e7dfc9634980 Mon Sep 17 00:00:00 2001 From c5156f8e2a156a902f0e5acb41eb0fda580555b5 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 12 Sep 2019 13:05:37 +0200 Date: Thu, 12 Sep 2019 13:05:37 +0200
Subject: [PATCH 02/15] If Vboot2 fails, fall-back to Vboot1 Subject: [PATCH 02/16] If Vboot2 fails, fall-back to Vboot1
Some devices, for instance Honor View 10, running Pie vendor declares Some devices, for instance Honor View 10, running Pie vendor declares
vbmeta in their device-tree, but doesn't have a vbmeta partition. vbmeta in their device-tree, but doesn't have a vbmeta partition.
@ -18,10 +18,10 @@ Change-Id: I97a7042fb03f817c41b801d558e438d2c1f6c375
1 file changed, 9 insertions(+), 2 deletions(-) 1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
index 042988eff..6dfa275e4 100644 index 50a92c861..ba9fbea82 100644
--- a/init/first_stage_mount.cpp --- a/init/first_stage_mount.cpp
+++ b/init/first_stage_mount.cpp +++ b/init/first_stage_mount.cpp
@@ -825,10 +825,17 @@ bool DoFirstStageMount(bool create_devices) { @@ -830,10 +830,17 @@ bool DoFirstStageMount(bool create_devices) {
} }
if (create_devices) { if (create_devices) {
@ -42,5 +42,5 @@ index 042988eff..6dfa275e4 100644
void SetInitAvbVersionInRecovery() { void SetInitAvbVersionInRecovery() {
-- --
2.25.1 2.34.1

View File

@ -1,7 +1,7 @@
From d6a1685452a436dac8e29290977fe4d6f31a12e5 Mon Sep 17 00:00:00 2001 From 985fd14abf275700574cd8b0a296658dbae3aee5 Mon Sep 17 00:00:00 2001
From: Alberto Ponces <ponces26@gmail.com> From: Alberto Ponces <ponces26@gmail.com>
Date: Wed, 28 Sep 2022 17:04:03 +0100 Date: Wed, 28 Sep 2022 17:04:03 +0100
Subject: [PATCH 03/15] Revert "Remove support for AVB 1.0." Subject: [PATCH 03/16] Revert "Remove support for AVB 1.0."
This reverts commit 21ef2310eb1ef4e61117b8a63741f3a9577a20c9. This reverts commit 21ef2310eb1ef4e61117b8a63741f3a9577a20c9.
@ -789,7 +789,7 @@ index 6c881c0bf..d029fd441 100644
} }
diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
index 6dfa275e4..a25516bb6 100644 index ba9fbea82..5c039a6a4 100644
--- a/init/first_stage_mount.cpp --- a/init/first_stage_mount.cpp
+++ b/init/first_stage_mount.cpp +++ b/init/first_stage_mount.cpp
@@ -81,7 +81,8 @@ class FirstStageMount { @@ -81,7 +81,8 @@ class FirstStageMount {
@ -841,7 +841,7 @@ index 6dfa275e4..a25516bb6 100644
} }
bool FirstStageMount::DoCreateDevices() { bool FirstStageMount::DoCreateDevices() {
@@ -662,6 +679,56 @@ void FirstStageMount::UseDsuIfPresent() { @@ -667,6 +684,56 @@ void FirstStageMount::UseDsuIfPresent() {
TransformFstabForDsu(&fstab_, active_dsu, dsu_partitions); TransformFstabForDsu(&fstab_, active_dsu, dsu_partitions);
} }
@ -929,5 +929,5 @@ index 52a7f7473..0a26abaa2 100644
if (!any_changed) any_changed = overlayfs_setup(enable); if (!any_changed) any_changed = overlayfs_setup(enable);
-- --
2.25.1 2.34.1

View File

@ -1,7 +1,7 @@
From 11b2314a589ff4dec60edaa9b21327c36e22d2bf Mon Sep 17 00:00:00 2001 From f06a75effbe761c587230b185f60de1a52646ec7 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 18 Oct 2020 18:14:47 +0200 Date: Sun, 18 Oct 2020 18:14:47 +0200
Subject: [PATCH 04/15] Don't abandon creating property tree if there is a Subject: [PATCH 04/16] Don't abandon creating property tree if there is a
conflict, and hope for the best conflict, and hope for the best
Change-Id: I194c815fdd58bfb84aaf7db02b8f0d00b4db21e8 Change-Id: I194c815fdd58bfb84aaf7db02b8f0d00b4db21e8
@ -31,5 +31,5 @@ index 803657ab8..ecdd0be20 100644
} }
-- --
2.25.1 2.34.1

View File

@ -1,7 +1,7 @@
From 2997750083de1ef7ec59738332223115f212d307 Mon Sep 17 00:00:00 2001 From db118048c81b4f3df407959b61623ec346487b48 Mon Sep 17 00:00:00 2001
From: Isaac Chen <tingyi364@gmail.com> From: Isaac Chen <tingyi364@gmail.com>
Date: Wed, 23 Jun 2021 13:07:30 +0800 Date: Wed, 23 Jun 2021 13:07:30 +0800
Subject: [PATCH 05/15] init: Do not start console service when debuggable Subject: [PATCH 05/16] init: Do not start console service when debuggable
Google added a check for this in R, when it's running it will show a Google added a check for this in R, when it's running it will show a
notification about that performance is impacted. notification about that performance is impacted.
@ -13,10 +13,10 @@ Change-Id: I34cfd6b42d3b9aee4b3e63181480cfb8b1255f29
1 file changed, 3 deletions(-) 1 file changed, 3 deletions(-)
diff --git a/rootdir/init.rc b/rootdir/init.rc diff --git a/rootdir/init.rc b/rootdir/init.rc
index c56f86089..a21d433ed 100644 index 02e51d2c4..ab45bb032 100644
--- a/rootdir/init.rc --- a/rootdir/init.rc
+++ b/rootdir/init.rc +++ b/rootdir/init.rc
@@ -1271,9 +1271,6 @@ on property:ro.debuggable=1 @@ -1277,9 +1277,6 @@ on property:ro.debuggable=1
# Give reads to anyone for the accessibility trace folder on debug builds. # Give reads to anyone for the accessibility trace folder on debug builds.
chmod 0775 /data/misc/a11ytrace chmod 0775 /data/misc/a11ytrace
@ -27,5 +27,5 @@ index c56f86089..a21d433ed 100644
# TODO(b/135984674): reset all necessary properties here. # TODO(b/135984674): reset all necessary properties here.
setprop sys.boot_completed "" setprop sys.boot_completed ""
-- --
2.25.1 2.34.1

View File

@ -1,7 +1,7 @@
From 2b6c2f46f312bd7425d6f4a11d72e2a582c33c3e Mon Sep 17 00:00:00 2001 From 1cbce95dd3de98e9b7f0241f9c4741fcd5f943dd Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 4 Sep 2019 21:11:48 +0200 Date: Wed, 4 Sep 2019 21:11:48 +0200
Subject: [PATCH 06/15] Panic into recovery rather than bootloader Subject: [PATCH 06/16] Panic into recovery rather than bootloader
Getting last_kmsg/pstore from bootloader isn't possible for other people Getting last_kmsg/pstore from bootloader isn't possible for other people
than the OEM, but we have TWRP to access last_kmsg/pstore than the OEM, but we have TWRP to access last_kmsg/pstore
@ -12,7 +12,7 @@ Change-Id: If04bb6572dc66677d7b44f7d302b2d69ce526200
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/init/reboot_utils.cpp b/init/reboot_utils.cpp diff --git a/init/reboot_utils.cpp b/init/reboot_utils.cpp
index b3fa9fd3b..03b5a6f0e 100644 index 1f411636c..cd25f80f1 100644
--- a/init/reboot_utils.cpp --- a/init/reboot_utils.cpp
+++ b/init/reboot_utils.cpp +++ b/init/reboot_utils.cpp
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
@ -34,5 +34,5 @@ index b3fa9fd3b..03b5a6f0e 100644
const std::string kRebootTargetStringPattern = kRebootTargetString + "="; const std::string kRebootTargetStringPattern = kRebootTargetString + "=";
start_pos += sizeof(kRebootTargetStringPattern) - 1; start_pos += sizeof(kRebootTargetStringPattern) - 1;
-- --
2.25.1 2.34.1

View File

@ -1,7 +1,7 @@
From 1074fa3ad741e17fb72a19db65e178e47a7d7896 Mon Sep 17 00:00:00 2001 From ead95f309a69e3de6107a15e460be30fbd309f86 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 14 Aug 2018 19:33:03 +0200 Date: Tue, 14 Aug 2018 19:33:03 +0200
Subject: [PATCH 07/15] Detect allowed sdcard options based on vndk Subject: [PATCH 07/16] Detect allowed sdcard options based on vndk
Some kernel crashes when using too recent sdcardfs options Some kernel crashes when using too recent sdcardfs options
@ -39,5 +39,5 @@ index 622de5b7a..e580190e9 100644
// handle older kernels that aren't updated yet. // handle older kernels that aren't updated yet.
for (int i = 0; i <= new_opts_list.size(); ++i) { for (int i = 0; i <= new_opts_list.size(); ++i) {
-- --
2.25.1 2.34.1

View File

@ -1,7 +1,7 @@
From 33b57bb6e520aa4d3c35c9db55a5f34441679d10 Mon Sep 17 00:00:00 2001 From 23ffc138d6bf032f93cf22b911031c32ceebc74b Mon Sep 17 00:00:00 2001
From: Alberto Ponces <ponces26@gmail.com> From: Alberto Ponces <ponces26@gmail.com>
Date: Tue, 1 Feb 2022 13:48:35 +0000 Date: Tue, 1 Feb 2022 13:48:35 +0000
Subject: [PATCH 08/15] Revert "Set /system/xbin permissions to 750." Subject: [PATCH 08/16] Revert "Set /system/xbin permissions to 750."
This reverts commit 42a1a126e554a8bca31d0afc832848b7b0fa1f4e. This reverts commit 42a1a126e554a8bca31d0afc832848b7b0fa1f4e.
@ -24,5 +24,5 @@ index a6835fc70..f686b469c 100644
{ 00751, AID_ROOT, AID_SHELL, 0, "system_ext/bin" }, { 00751, AID_ROOT, AID_SHELL, 0, "system_ext/bin" },
{ 00751, AID_ROOT, AID_SHELL, 0, "system_ext/apex/*/bin" }, { 00751, AID_ROOT, AID_SHELL, 0, "system_ext/apex/*/bin" },
-- --
2.25.1 2.34.1

View File

@ -1,7 +1,7 @@
From 81cfefebd11b0afcc6fac44d0ae70919649c05b7 Mon Sep 17 00:00:00 2001 From f31fd342eaf6f98e769e1f121f56eaf81def02df Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 1 Nov 2019 18:22:13 +0100 Date: Fri, 1 Nov 2019 18:22:13 +0100
Subject: [PATCH 09/15] Ugly but secure: Set /dev/uinput as 0666 to fix Subject: [PATCH 09/16] Ugly but secure: Set /dev/uinput as 0666 to fix
fingerprint sensor on some devices fingerprint sensor on some devices
cf https://github.com/phhusson/device_phh_treble/pull/122/commits/e000d69c286b6686777ea6f1867f379e30273e48 cf https://github.com/phhusson/device_phh_treble/pull/122/commits/e000d69c286b6686777ea6f1867f379e30273e48
@ -28,5 +28,5 @@ index 4ec59afe9..c9cd629b3 100644
/dev/tty0 0660 root system /dev/tty0 0660 root system
/dev/graphics/* 0660 root graphics /dev/graphics/* 0660 root graphics
-- --
2.25.1 2.34.1

View File

@ -1,7 +1,7 @@
From 0f141599980f5ef506a33d08a32647c77981b262 Mon Sep 17 00:00:00 2001 From d6a1d56b28a1d01aa6fdf7ebe8235381c7a00ed7 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 22 Jan 2022 14:34:45 -0500 Date: Sat, 22 Jan 2022 14:34:45 -0500
Subject: [PATCH 10/15] Add my own OTA mechanism going over /data Subject: [PATCH 10/16] Add my own OTA mechanism going over /data
Change-Id: I9cacff2d761affa0376b4bb8ca63353a9d95b5de Change-Id: I9cacff2d761affa0376b4bb8ca63353a9d95b5de
--- ---
@ -132,5 +132,5 @@ index be8c5542f..59d41e373 100644
boot_clock::time_point start_time = boot_clock::now(); boot_clock::time_point start_time = boot_clock::now();
-- --
2.25.1 2.34.1

View File

@ -1,7 +1,7 @@
From 2ba8c53774310e3b80fa1f2d3d008c14d8033354 Mon Sep 17 00:00:00 2001 From 558b30744fda7ce35699525bb5e674acdfc66a49 Mon Sep 17 00:00:00 2001
From: Alberto Ponces <ponces26@gmail.com> From: Alberto Ponces <ponces26@gmail.com>
Date: Mon, 3 Oct 2022 13:50:36 +0100 Date: Mon, 3 Oct 2022 13:50:36 +0100
Subject: [PATCH 11/15] fs_mgr: Keep allowing encryptable fstab flag Subject: [PATCH 11/16] fs_mgr: Keep allowing encryptable fstab flag
Some users still use "encryptable" flag while being unencrypted. Let them still boot their devices. Some users still use "encryptable" flag while being unencrypted. Let them still boot their devices.
@ -33,5 +33,5 @@ index 2933b61f8..5bed8e954 100644
} }
-- --
2.25.1 2.34.1

View File

@ -1,7 +1,7 @@
From 89fe6573b20df3351b67a653580fac6d55f2d9fd Mon Sep 17 00:00:00 2001 From edfd2c0ba42a35e223b3bd35983edf9427c11fa8 Mon Sep 17 00:00:00 2001
From: ChonDoit <thphantomblog@gmail.com> From: ChonDoit <thphantomblog@gmail.com>
Date: Sat, 6 Aug 2022 15:20:41 +0000 Date: Sat, 6 Aug 2022 15:20:41 +0000
Subject: [PATCH 12/15] Add offline Charge Service Subject: [PATCH 12/16] Add offline Charge Service
Properly Thanks to Victor Bo/Ponces for base patches. Properly Thanks to Victor Bo/Ponces for base patches.
@ -15,7 +15,7 @@ Additions
1 file changed, 15 insertions(+) 1 file changed, 15 insertions(+)
diff --git a/rootdir/init.rc b/rootdir/init.rc diff --git a/rootdir/init.rc b/rootdir/init.rc
index a21d433ed..e188e9b9a 100644 index ab45bb032..a26e6679e 100644
--- a/rootdir/init.rc --- a/rootdir/init.rc
+++ b/rootdir/init.rc +++ b/rootdir/init.rc
@@ -11,6 +11,17 @@ import /vendor/etc/init/hw/init.${ro.hardware}.rc @@ -11,6 +11,17 @@ import /vendor/etc/init/hw/init.${ro.hardware}.rc
@ -36,7 +36,7 @@ index a21d433ed..e188e9b9a 100644
# Cgroups are mounted right before early-init using list from /etc/cgroups.json # Cgroups are mounted right before early-init using list from /etc/cgroups.json
on early-init on early-init
# Disable sysrq from keyboard # Disable sysrq from keyboard
@@ -1181,6 +1192,10 @@ on nonencrypted @@ -1187,6 +1198,10 @@ on nonencrypted
on property:sys.init_log_level=* on property:sys.init_log_level=*
loglevel ${sys.init_log_level} loglevel ${sys.init_log_level}
@ -48,5 +48,5 @@ index a21d433ed..e188e9b9a 100644
class_start charger class_start charger
-- --
2.25.1 2.34.1

View File

@ -1,7 +1,7 @@
From 2ee7afd05b625f687ee81947988bebcbe1844a6c Mon Sep 17 00:00:00 2001 From b390c9c1861eff260c57944dba34e265dca7d541 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 26 Oct 2022 17:59:11 -0400 Date: Wed, 26 Oct 2022 17:59:11 -0400
Subject: [PATCH 13/15] Fix support for devices without cgroupv2 support Subject: [PATCH 13/16] Fix support for devices without cgroupv2 support
This is technically a revert of 1bd1746447. This is technically a revert of 1bd1746447.
The warning inside the commit doesn't really apply to us, because the The warning inside the commit doesn't really apply to us, because the
@ -12,10 +12,10 @@ devices without cgroupv2 simply won't freeze processes at all
1 file changed, 4 insertions(+) 1 file changed, 4 insertions(+)
diff --git a/init/service.cpp b/init/service.cpp diff --git a/init/service.cpp b/init/service.cpp
index 34e820016..da19491c9 100644 index 7e43061c4..347464a14 100644
--- a/init/service.cpp --- a/init/service.cpp
+++ b/init/service.cpp +++ b/init/service.cpp
@@ -665,11 +665,15 @@ Result<void> Service::Start() { @@ -666,11 +666,15 @@ Result<void> Service::Start() {
limit_percent_ != -1 || !limit_property_.empty(); limit_percent_ != -1 || !limit_property_.empty();
errno = -createProcessGroup(proc_attr_.uid, pid_, use_memcg); errno = -createProcessGroup(proc_attr_.uid, pid_, use_memcg);
if (errno != 0) { if (errno != 0) {
@ -32,5 +32,5 @@ index 34e820016..da19491c9 100644
if (use_memcg) { if (use_memcg) {
-- --
2.25.1 2.34.1

View File

@ -1,7 +1,7 @@
From 833b62c25d6cd3c77f878831c98d11a36bc25c38 Mon Sep 17 00:00:00 2001 From dfcffd8d842e382dd1b94ea63125ed29c9532c4e Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 10 Nov 2022 13:30:50 -0500 Date: Thu, 10 Nov 2022 13:30:50 -0500
Subject: [PATCH 14/15] FDE is dead. Fallback FDE to no encryption, and FDE+FBE Subject: [PATCH 14/16] FDE is dead. Fallback FDE to no encryption, and FDE+FBE
to FBE to FBE
--- ---
@ -34,5 +34,5 @@ index 5bed8e954..15a8d275b 100644
// The voldmanaged flag is followed by an = and the label, a colon and the partition // The voldmanaged flag is followed by an = and the label, a colon and the partition
// number or the word "auto", e.g. voldmanaged=sdcard:3 // number or the word "auto", e.g. voldmanaged=sdcard:3
-- --
2.25.1 2.34.1

View File

@ -1,7 +1,7 @@
From 1fb477a4e6826352008c046390f05b4c4a94d8dc Mon Sep 17 00:00:00 2001 From de18ef2a13fb19ade1c87f75f212fc87a68ec566 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 9 Dec 2022 13:57:10 -0500 Date: Fri, 9 Dec 2022 13:57:10 -0500
Subject: [PATCH 15/15] Let system override adb/secure props, so we dont get Subject: [PATCH 15/16] Let system override adb/secure props, so we dont get
stuck in ro.adb.secure=1 vendors stuck in ro.adb.secure=1 vendors
--- ---
@ -9,7 +9,7 @@ Subject: [PATCH 15/15] Let system override adb/secure props, so we dont get
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/init/property_service.cpp b/init/property_service.cpp diff --git a/init/property_service.cpp b/init/property_service.cpp
index 02fb8049b..b0027bfc6 100644 index af7abe643..85bf55d98 100644
--- a/init/property_service.cpp --- a/init/property_service.cpp
+++ b/init/property_service.cpp +++ b/init/property_service.cpp
@@ -727,7 +727,7 @@ static void LoadProperties(char* data, const char* filter, const char* filename, @@ -727,7 +727,7 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
@ -22,5 +22,5 @@ index 02fb8049b..b0027bfc6 100644
} else { } else {
it->second = value; it->second = value;
-- --
2.25.1 2.34.1

View File

@ -0,0 +1,53 @@
From 855a9713ea1a2c64144d1da837e30d5225643e28 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 28 Apr 2023 12:29:05 -0400
Subject: [PATCH 16/16] Allow apex on > 5.0 kernels. This is needed because on
Pixels, camera HAL are exclusively in vendor apex
---
init/property_service.cpp | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/init/property_service.cpp b/init/property_service.cpp
index 85bf55d98..f00812ed8 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -61,6 +61,7 @@
#include <selinux/android.h>
#include <selinux/label.h>
#include <selinux/selinux.h>
+#include <sys/utsname.h>
#include "debug_ramdisk.h"
#include "epoll.h"
@@ -633,6 +634,16 @@ uint32_t InitPropertySet(const std::string& name, const std::string& value) {
static bool load_properties_from_file(const char*, const char*,
std::map<std::string, std::string>*);
+static bool kernel_supports_capex() {
+ //Put a threshold at >= 5.0
+ struct utsname buf;
+ uname(&buf);
+ const char *where = buf.release;
+ int a = atoi(where);
+ if(a <= 4) return false;
+ return true;
+}
+
/*
* Filter is used to decide which properties to load: NULL loads all keys,
* "ro.foo.*" is a prefix match, and "ro.foo.bar" is an exact match.
@@ -727,7 +738,9 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
} else if (it->second != value) {
LOG(WARNING) << "Overriding previous property '" << key << "':'" << it->second
<< "' with new value '" << value << "'";
- if(strcmp("ro.apex.updatable", key) == 0 || strstr(key, "adb") || strstr(key, "secure")) {
+ if(strcmp("ro.apex.updatable", key) == 0 && !kernel_supports_capex()) {
+ LOG(WARNING) << "... Ignored apex by kernel version";
+ } else if(strstr(key, "adb") || strstr(key, "secure")) {
LOG(WARNING) << "... Ignored";
} else {
it->second = value;
--
2.34.1