From 6571d2ceb42930dab01677ef0e95e732d5076fb8 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 12 May 2018 16:19:33 +0200 Subject: Remove MOZ_WIDGET_GONK [1/2] Tag #288 --- hal/linux/LinuxPower.cpp | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'hal/linux') diff --git a/hal/linux/LinuxPower.cpp b/hal/linux/LinuxPower.cpp index 70ab4a3f6..626d1ac0c 100644 --- a/hal/linux/LinuxPower.cpp +++ b/hal/linux/LinuxPower.cpp @@ -12,28 +12,9 @@ #include "mozilla/Services.h" #include "MainThreadUtils.h" -#if defined(MOZ_WIDGET_GONK) -#include "cutils/android_reboot.h" -#include "cutils/properties.h" -#endif - namespace mozilla { namespace hal_impl { -#if (defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 19) -static void -PowerCtl(const char* aValue, int aCmd) -{ - // this invokes init's powerctl builtin via /init.rc - property_set("sys.powerctl", aValue); - // device should reboot in few moments, but if it doesn't - call - // android_reboot() to make sure that init isn't stuck somewhere - sleep(10); - HAL_LOG("Powerctl call takes too long, forcing %s.", aValue); - android_reboot(aCmd, 0, nullptr); -} -#endif - void Reboot() { @@ -44,14 +25,8 @@ Reboot() } } -#if !defined(MOZ_WIDGET_GONK) sync(); reboot(RB_AUTOBOOT); -#elif (ANDROID_VERSION < 19) - android_reboot(ANDROID_RB_RESTART, 0, nullptr); -#else - PowerCtl("reboot", ANDROID_RB_RESTART); -#endif } void @@ -64,14 +39,8 @@ PowerOff() } } -#if !defined(MOZ_WIDGET_GONK) sync(); reboot(RB_POWER_OFF); -#elif (ANDROID_VERSION < 19) - android_reboot(ANDROID_RB_POWEROFF, 0, nullptr); -#else - PowerCtl("shutdown", ANDROID_RB_POWEROFF); -#endif } // Structure to specify how watchdog pthread is going to work. -- cgit v1.2.3