From 8c4fd759c6fb5139f80a3416c6c2da7f2f2bd6f5 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 3 May 2020 23:07:40 -0700
Subject: [PATCH] Strip Huawei specific logic

Users should manually switch to recovery mode instead
---
 native/jni/init/getinfo.cpp | 34 +++++++---------------------------
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/native/jni/init/getinfo.cpp b/native/jni/init/getinfo.cpp
index c30c1f3da..5d707074a 100644
--- a/native/jni/init/getinfo.cpp
+++ b/native/jni/init/getinfo.cpp
@@ -99,15 +99,11 @@ void load_kernel_info(cmdline *cmd) {
 	xmount("sysfs", "/sys", "sysfs", 0, nullptr);
 
 	// Disable kmsg rate limiting
-	if (FILE *rate = fopen("/proc/sys/kernel/printk_devkmsg", "w"); rate) {
+	if (FILE *rate = fopen("/proc/sys/kernel/printk_devkmsg", "w")) {
 		fprintf(rate, "on\n");
 		fclose(rate);
 	}
 
-	bool enter_recovery = false;
-	bool kirin = false;
-	bool recovery_mode = false;
-
 	parse_cmdline([&](auto key, auto value) -> void {
 		if (key == "androidboot.slot_suffix") {
 			strcpy(cmd->slot, value);
@@ -120,38 +116,22 @@ void load_kernel_info(cmdline *cmd) {
 			cmd->force_normal_boot = value[0] == '1';
 		} else if (key == "androidboot.android_dt_dir") {
 			strcpy(cmd->dt_dir, value);
-		} else if (key == "enter_recovery") {
-			enter_recovery = value[0] == '1';
 		} else if (key == "androidboot.hardware") {
 			strcpy(cmd->hardware, value);
-			kirin = strstr(value, "kirin") || strstr(value, "hi3660") || strstr(value, "hi6250");
 		} else if (key == "androidboot.hardware.platform") {
 			strcpy(cmd->hardware_plat, value);
 		}
 	});
 
-	parse_prop_file("/.backup/.magisk", [&](auto key, auto value) -> bool {
-		if (key == "RECOVERYMODE" && value == "true")
-			recovery_mode = true;
+	parse_prop_file("/.backup/.magisk", [=](auto key, auto value) -> bool {
+		if (key == "RECOVERYMODE" && value == "true") {
+			LOGD("Running in recovery mode, waiting for key...\n");
+			cmd->skip_initramfs = !check_key_combo();
+			return false;
+		}
 		return true;
 	});
 
-	if (kirin && enter_recovery) {
-		// Inform that we are actually booting as recovery
-		if (!recovery_mode) {
-			if (FILE *f = fopen("/.backup/.magisk", "ae"); f) {
-				fprintf(f, "RECOVERYMODE=true\n");
-				fclose(f);
-			}
-			recovery_mode = true;
-		}
-	}
-
-	if (recovery_mode) {
-		LOGD("Running in recovery mode, waiting for key...\n");
-		cmd->skip_initramfs = !check_key_combo();
-	}
-
 	if (cmd->dt_dir[0] == '\0')
 		strcpy(cmd->dt_dir, DEFAULT_DT_DIR);