From 44c01c088303546c6197afddeb367f79a22afefd Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Thu, 24 May 2018 13:16:54 -0700 Subject: [PATCH] Revert "blank_screen: always exit with _exit()." This was a temporary workaround in Android P, but it is fixed with a relatively more dangerous change in libhwbinder. This reverts commit 73ba34f1b7ab37a71c91ddbbe3e6d490d2161d34. Bug: 77934844 Test: reboot device and watch for screen to get shutdown, check logs Change-Id: I970144eea4acd8254f4a67ebe803f3c3eda9aba2 --- light/utils/main.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/light/utils/main.cpp b/light/utils/main.cpp index 724e0eefae..d07e799ab9 100644 --- a/light/utils/main.cpp +++ b/light/utils/main.cpp @@ -55,6 +55,5 @@ int main() { } }); - // b/77934844: Avoid running static destructors. - _exit(1); + return 0; }