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

Commit 66e5ae0f authored by Elliott Hughes's avatar Elliott Hughes
Browse files

libcutils: android_reboot command should be unsigned. 

Hex literals have the type of the first type they fit in. The reboot
constants are large enough that that's `unsigned` rather than `int`.

Bug: http://b/76110968
Test: treehugger
Change-Id: Iac4fe61d1fe572297febf0b57e34d698942469f9
parent 43f29072

libcutils/android_reboot.cpp

+2 −2
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ 


#define TAG "android_reboot"



int android_reboot(int cmd, int /*flags*/, const char* arg) {

int android_reboot(unsigned cmd, int /*flags*/, const char* arg) {

    int ret;

    const char* restart_cmd = NULL;

    char* prop_value;



    switch (static_cast<unsigned>(cmd)) {

    switch (cmd) {

        case ANDROID_RB_RESTART:  // deprecated

        case ANDROID_RB_RESTART2:

            restart_cmd = "reboot";

libcutils/include/cutils/android_reboot.h

+3 −6
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 */



#ifndef __CUTILS_ANDROID_REBOOT_H__

#define __CUTILS_ANDROID_REBOOT_H__

#pragma once



#include <sys/cdefs.h>
@@ -36,10 +35,8 @@ __BEGIN_DECLS 
/* Reboot or shutdown the system.

 * This call uses ANDROID_RB_PROPERTY to request reboot to init process.

 * Due to that, process calling this should have proper selinux permission

 * to write to the property. Otherwise, the call will fail.

 * to write to the property or the call will fail.

 */

int android_reboot(int cmd, int flags, const char *arg);

int android_reboot(unsigned cmd, int flags, const char* arg);



__END_DECLS
 


#endif /* __CUTILS_ANDROID_REBOOT_H__ */