summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-02-04 01:11:39 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-02-04 01:11:39 +0000
commit55732f49287a75f9baabe9f150443aec9234c90d (patch)
tree7cae7246573de9431b92ed4c027b583fe904087f
parente44d25d64537f4ea2abcb56aabc7a5bf0731c222 (diff)
parent0068da6a9355fae96549f9f50289648971cd64cd (diff)
downloadsystem_core-55732f49287a75f9baabe9f150443aec9234c90d.zip
system_core-55732f49287a75f9baabe9f150443aec9234c90d.tar.gz
system_core-55732f49287a75f9baabe9f150443aec9234c90d.tar.bz2
Merge "android_reboot should take a const char*."
-rw-r--r--include/cutils/android_reboot.h2
-rw-r--r--libcutils/android_reboot.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/cutils/android_reboot.h b/include/cutils/android_reboot.h
index 8c30e8e..85e1b7e 100644
--- a/include/cutils/android_reboot.h
+++ b/include/cutils/android_reboot.h
@@ -27,7 +27,7 @@ __BEGIN_DECLS
/* Properties */
#define ANDROID_RB_PROPERTY "sys.powerctl"
-int android_reboot(int cmd, int flags, char *arg);
+int android_reboot(int cmd, int flags, const char *arg);
__END_DECLS
diff --git a/libcutils/android_reboot.c b/libcutils/android_reboot.c
index aa86206..6ae23c1 100644
--- a/libcutils/android_reboot.c
+++ b/libcutils/android_reboot.c
@@ -89,7 +89,7 @@ static void remount_ro(void)
}
-int android_reboot(int cmd, int flags UNUSED, char *arg)
+int android_reboot(int cmd, int flags UNUSED, const char *arg)
{
int ret;