diff options
| author | San Mehat <san@google.com> | 2010-01-12 09:59:35 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-12 09:59:35 -0800 |
| commit | c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0 (patch) | |
| tree | 87cf83cbc4cb36929bb76abacbe658903fd964c5 /core/jni/android_os_Power.cpp | |
| parent | dfe25b0e0c382d04a59bb03c7f5f8689ece5395e (diff) | |
| parent | 7ebf017658070323ed1c2bbd80c46c7cd2390d87 (diff) | |
| download | frameworks_base-c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0.zip frameworks_base-c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0.tar.gz frameworks_base-c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0.tar.bz2 | |
Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair
Diffstat (limited to 'core/jni/android_os_Power.cpp')
| -rw-r--r-- | core/jni/android_os_Power.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_os_Power.cpp b/core/jni/android_os_Power.cpp index df5edba..a46c2dd 100644 --- a/core/jni/android_os_Power.cpp +++ b/core/jni/android_os_Power.cpp @@ -105,7 +105,7 @@ static JNINativeMethod method_table[] = { { "setLastUserActivityTimeout", "(J)I", (void*)setLastUserActivityTimeout }, { "setScreenState", "(Z)I", (void*)setScreenState }, { "shutdown", "()V", (void*)android_os_Power_shutdown }, - { "reboot", "(Ljava/lang/String;)V", (void*)android_os_Power_reboot }, + { "rebootNative", "(Ljava/lang/String;)V", (void*)android_os_Power_reboot }, }; int register_android_os_Power(JNIEnv *env) |