diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-07-13 11:06:57 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-07-13 19:45:44 -0400 |
| commit | c1b9bbb21c8ad5109978a4e9e770cd18b0257434 (patch) | |
| tree | bfb7dd2272e5fe29d3c0fc4f22ca708e00bc10be /core/jni/android_os_Power.cpp | |
| parent | b6e5e7a740bf595a1a5d32b28549e5d579a04ee3 (diff) | |
| download | frameworks_base-c1b9bbb21c8ad5109978a4e9e770cd18b0257434.zip frameworks_base-c1b9bbb21c8ad5109978a4e9e770cd18b0257434.tar.gz frameworks_base-c1b9bbb21c8ad5109978a4e9e770cd18b0257434.tar.bz2 | |
Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build
Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'core/jni/android_os_Power.cpp')
| -rw-r--r-- | core/jni/android_os_Power.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/core/jni/android_os_Power.cpp b/core/jni/android_os_Power.cpp index 9ae4a63..dc16990 100644 --- a/core/jni/android_os_Power.cpp +++ b/core/jni/android_os_Power.cpp @@ -70,16 +70,11 @@ setScreenState(JNIEnv *env, jobject clazz, jboolean on) static void android_os_Power_shutdown(JNIEnv *env, jobject clazz) { -#ifdef HAVE_ANDROID_OS android_reboot(ANDROID_RB_POWEROFF, 0, 0); -#else - sync(); -#endif } static void android_os_Power_reboot(JNIEnv *env, jobject clazz, jstring reason) { -#ifdef HAVE_ANDROID_OS if (reason == NULL) { android_reboot(ANDROID_RB_RESTART, 0, 0); } else { @@ -88,9 +83,6 @@ static void android_os_Power_reboot(JNIEnv *env, jobject clazz, jstring reason) env->ReleaseStringUTFChars(reason, chars); // In case it fails. } jniThrowIOException(env, errno); -#else - sync(); -#endif } static JNINativeMethod method_table[] = { |