diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-11-22 11:28:10 -0800 |
|---|---|---|
| committer | Conley Owens <cco3@android.com> | 2013-11-22 13:44:43 -0800 |
| commit | 66ed50af6870210ce013a5588a688434a5d48ee9 (patch) | |
| tree | a879f3ea31083496d0efe491bc187b6e0ebada39 /libcutils/android_reboot.c | |
| parent | dd2ac3de625e6c0328a0f70530d8ade0d2151bfc (diff) | |
| parent | 536dea9d61a032e64bbe584a97463c6638ead009 (diff) | |
| download | core-66ed50af6870210ce013a5588a688434a5d48ee9.tar.gz core-66ed50af6870210ce013a5588a688434a5d48ee9.tar.bz2 core-66ed50af6870210ce013a5588a688434a5d48ee9.zip | |
Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEAD
Change-Id: I5c469a4b738629d99d721cad7ded02d6c35f56d5
Diffstat (limited to 'libcutils/android_reboot.c')
| -rw-r--r-- | libcutils/android_reboot.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libcutils/android_reboot.c b/libcutils/android_reboot.c index 7b3ec6f7f..aef30544c 100644 --- a/libcutils/android_reboot.c +++ b/libcutils/android_reboot.c @@ -106,11 +106,8 @@ int android_reboot(int cmd, int flags, char *arg) { int ret; - if (!(flags & ANDROID_RB_FLAG_NO_SYNC)) - sync(); - - if (!(flags & ANDROID_RB_FLAG_NO_REMOUNT_RO)) - remount_ro(); + sync(); + remount_ro(); switch (cmd) { case ANDROID_RB_RESTART: |