Changes for March 2022, syncing up to v410
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
From 291265e4179a03a9407ed2e7a7f898be0eb25e00 Mon Sep 17 00:00:00 2001
|
||||
From 5e9668c16e8cd71526cb2b451c9a072ed14f12dc Mon Sep 17 00:00:00 2001
|
||||
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
|
||||
Date: Sat, 6 Nov 2021 05:43:23 +0000
|
||||
Date: Sun, 13 Mar 2022 11:06:37 +0000
|
||||
Subject: [PATCH 1/4] Revert "init: Add vendor-specific initialization hooks."
|
||||
|
||||
This reverts commit e2dc41bcfb140e0119e0f7e34eccfb2335ae7f89.
|
||||
This reverts commit 99ef051a7d0d34103babf5f2297dd2747c28570c.
|
||||
---
|
||||
init/Android.bp | 9 ---------
|
||||
init/NOTICE | 26 --------------------------
|
||||
@@ -15,7 +15,7 @@ This reverts commit e2dc41bcfb140e0119e0f7e34eccfb2335ae7f89.
|
||||
delete mode 100644 init/vendor_init.h
|
||||
|
||||
diff --git a/init/Android.bp b/init/Android.bp
|
||||
index 69f8815ed..7eeafa24b 100644
|
||||
index 00ac6a752..a57f3a407 100644
|
||||
--- a/init/Android.bp
|
||||
+++ b/init/Android.bp
|
||||
@@ -89,14 +89,6 @@ init_host_sources = [
|
||||
@@ -30,10 +30,10 @@ index 69f8815ed..7eeafa24b 100644
|
||||
- ],
|
||||
-}
|
||||
-
|
||||
cc_defaults {
|
||||
name: "init_defaults",
|
||||
sanitize: {
|
||||
@@ -190,7 +182,6 @@ cc_library_static {
|
||||
soong_config_module_type {
|
||||
name: "libinit_cc_defaults",
|
||||
module_type: "cc_defaults",
|
||||
@@ -211,7 +203,6 @@ cc_library_static {
|
||||
defaults: [
|
||||
"init_defaults",
|
||||
"selinux_policy_version",
|
||||
@@ -76,7 +76,7 @@ index 383d0f541..c5b1efa7a 100644
|
||||
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
|
||||
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
diff --git a/init/property_service.cpp b/init/property_service.cpp
|
||||
index bc9a29dea..5974065f5 100644
|
||||
index 1600744ff..49500428e 100644
|
||||
--- a/init/property_service.cpp
|
||||
+++ b/init/property_service.cpp
|
||||
@@ -73,7 +73,6 @@
|
||||
@@ -87,7 +87,7 @@ index bc9a29dea..5974065f5 100644
|
||||
|
||||
using namespace std::literals;
|
||||
|
||||
@@ -1097,9 +1096,6 @@ void PropertyLoadBootDefaults() {
|
||||
@@ -1102,9 +1101,6 @@ void PropertyLoadBootDefaults() {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 0263909a309cbc35efd586b4aec14e46ed23e2d7 Mon Sep 17 00:00:00 2001
|
||||
From 4007d7537bdff0aa9ee444731c57a5a9b2b84256 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 2/4] Panic into recovery rather than bootloader
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From e2392f1b2f4afbf783fd6b1b25c2d905828c71f1 Mon Sep 17 00:00:00 2001
|
||||
From 7b79958277c40838fdbbcd7c9324cb9543318290 Mon Sep 17 00:00:00 2001
|
||||
From: Victor Bo <bvoid@yandex.ru>
|
||||
Date: Wed, 3 Mar 2021 06:31:17 -0500
|
||||
Subject: [PATCH 3/4] Restore /sbin for Magisk compatibility
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 1c13959077f9616c050b4ee92420f561b3af6121 Mon Sep 17 00:00:00 2001
|
||||
From e3589c745007dbc2f9c983dd68f0fc82fdd56244 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/4] fix offline charger v7
|
||||
@@ -9,7 +9,7 @@ Subject: [PATCH 4/4] fix offline charger v7
|
||||
1 file changed, 11 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/rootdir/init.rc b/rootdir/init.rc
|
||||
index 376a678a8..6434d06bf 100644
|
||||
index 5116c0fea..76f2bf60e 100644
|
||||
--- a/rootdir/init.rc
|
||||
+++ b/rootdir/init.rc
|
||||
@@ -11,6 +11,11 @@ import /vendor/etc/init/hw/init.${ro.hardware}.rc
|
||||
@@ -24,7 +24,7 @@ index 376a678a8..6434d06bf 100644
|
||||
# Cgroups are mounted right before early-init using list from /etc/cgroups.json
|
||||
on early-init
|
||||
# Disable sysrq from keyboard
|
||||
@@ -452,7 +457,7 @@ on init
|
||||
@@ -456,7 +461,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
|
||||
@@ -33,7 +33,7 @@ index 376a678a8..6434d06bf 100644
|
||||
trigger late-init
|
||||
|
||||
on load_persist_props_action
|
||||
@@ -1090,8 +1095,12 @@ on nonencrypted
|
||||
@@ -1108,8 +1113,12 @@ on nonencrypted
|
||||
on property:sys.init_log_level=*
|
||||
loglevel ${sys.init_log_level}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user