diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-01-12 11:53:42 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-01-12 11:53:42 -0800 |
| commit | fa101530bc74bdf1517a1840a9415249211b9414 (patch) | |
| tree | f0c93712359e7b102a1ed5edd2fb81a7f6ecb374 /core/jni | |
| parent | 8f028a94fc533e75077485a7d11a04e4de820335 (diff) | |
| parent | d26707da8965bffb63c55d729f19ddfcb83044b3 (diff) | |
| download | frameworks_base-fa101530bc74bdf1517a1840a9415249211b9414.zip frameworks_base-fa101530bc74bdf1517a1840a9415249211b9414.tar.gz frameworks_base-fa101530bc74bdf1517a1840a9415249211b9414.tar.bz2 | |
resolved conflicts for merge of d26707da to master
Change-Id: I1a379194f70c4b14191333ca2d8e6dd9d8b0f9dd
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) |