Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 201d4b21 authored by nkk71's avatar nkk71 Committed by Dees Troy
Browse files

vold_decrypt: Add back missing xml and get rid of compiler warning 

Change-Id: I883112e2618f560e96002e2076e2735cc20cfac3
parent 64c5c0a9

crypto/vold_decrypt/vold_decrypt.cpp

+4 −5
Original line number Diff line number Diff line
@@ -215,11 +215,11 @@ void set_needed_props(void) { 
}



string vdc_cryptfs_cmd(string log_name) {

	string cmd;

	string cmd = "LD_LIBRARY_PATH=/system/lib64:/system/lib /system/bin/vdc cryptfs";



	cmd = "LD_LIBRARY_PATH=/system/lib64:/system/lib /system/bin/vdc cryptfs";



#ifdef TW_CRYPTO_SYSTEM_VOLD_DEBUG

#ifndef TW_CRYPTO_SYSTEM_VOLD_DEBUG

	(void)log_name; // do nothing, but get rid of compiler warning in non debug builds

#else

	if (has_timeout && has_strace)

		cmd = "/sbin/strace -q -tt -ff -v -y -s 1000 -o /tmp/strace_vdc_" + log_name + " /sbin/timeout -t 30 -s KILL env " + cmd;

	else if (has_strace)
@@ -552,7 +552,6 @@ int vold_decrypt(string Password) 
#ifdef TW_CRYPTO_SYSTEM_VOLD_DEBUG

	if (pid_strace > 0) {

		LOGDECRYPT_KMSG("Stopping strace_init (pid=%d)\n", pid_strace);

		int died = 0;

		int timeout;

		int status;

		pid_t retpid = waitpid(pid_strace, &status, WNOHANG);

gui/theme/common/languages/en.xml

+1 −0
Original line number Diff line number Diff line
@@ -454,6 +454,7 @@ 
		<string name="decrypt_data_failed_pattern">Pattern failed, please try again!</string>

		<string name="decrypt_data_enter_pattern">Enter Pattern.</string>

		<string name="decrypt_data_trying">Trying Decryption</string>

		<string name="decrypt_data_vold_os_missing">Missing files needed for vold decrypt: {1}</string>

		<string name="term_hdr">Terminal Command</string>

		<string name="term_s_hdr">Terminal</string>

		<string name="term_kill_btn">KILL</string>