diff options
| author | San Mehat <san@google.com> | 2010-01-12 10:02:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-12 10:02:40 -0800 |
| commit | d26707da8965bffb63c55d729f19ddfcb83044b3 (patch) | |
| tree | a371e18a5b2c5068a08dd750efa34fca5c2ff43f /core/jni | |
| parent | f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8 (diff) | |
| parent | c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0 (diff) | |
| download | frameworks_base-d26707da8965bffb63c55d729f19ddfcb83044b3.zip frameworks_base-d26707da8965bffb63c55d729f19ddfcb83044b3.tar.gz frameworks_base-d26707da8965bffb63c55d729f19ddfcb83044b3.tar.bz2 | |
am c93c70c4: Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair
Merge commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0' into eclair-plus-aosp
* commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0':
framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
Diffstat (limited to 'core/jni')
| -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) |