summaryrefslogtreecommitdiffstats
path: root/libcutils/include
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2019-04-02 19:52:28 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-02 19:52:28 -0700
commit15e370acedb4cf6a5e27472e8ff6030c1a96bf22 (patch)
tree98f0c7395a3e8af12e8ebd146fd525b7510974da /libcutils/include
parentaf200d9bc556806e6bd20b737daac55f68126310 (diff)
parentba78d39cdc007ce2edddc9af21147a554eef4e54 (diff)
downloadsystem_core-15e370acedb4cf6a5e27472e8ff6030c1a96bf22.tar.gz
system_core-15e370acedb4cf6a5e27472e8ff6030c1a96bf22.tar.bz2
system_core-15e370acedb4cf6a5e27472e8ff6030c1a96bf22.zip
Merge "libcutils: android_reboot command should be unsigned." am: e3ec16b9c6 am: cf2f309cff
am: ba78d39cdc Change-Id: I034c780c6c1166e4c6643ebcc607d3388246ebab
Diffstat (limited to 'libcutils/include')
-rw-r--r--libcutils/include/cutils/android_reboot.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/libcutils/include/cutils/android_reboot.h b/libcutils/include/cutils/android_reboot.h
index 99030eddd..cd27eef88 100644
--- a/libcutils/include/cutils/android_reboot.h
+++ b/libcutils/include/cutils/android_reboot.h
@@ -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__ */