diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-09-26 01:24:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 01:24:14 +0000 |
| commit | 042b32c8d29f3e8da834bac10979d0fcf89cc9a6 (patch) | |
| tree | deac6b8e6b8e3a439347cc81d8477a7eb508de67 /core/jni/android_util_Binder.cpp | |
| parent | 10db809f24d04e0ed87ef061702f9222ce74b5ae (diff) | |
| parent | a7b1595c2590574d0e4ac0f0932c25206ca909ef (diff) | |
| download | frameworks_base-042b32c8d29f3e8da834bac10979d0fcf89cc9a6.zip frameworks_base-042b32c8d29f3e8da834bac10979d0fcf89cc9a6.tar.gz frameworks_base-042b32c8d29f3e8da834bac10979d0fcf89cc9a6.tar.bz2 | |
am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
* commit '0b1eb9d4ae339629fbbf226160896a917cad4d0d':
Work on issue #17656716: Unhandled exception in Window Manager
Diffstat (limited to 'core/jni/android_util_Binder.cpp')
| -rw-r--r-- | core/jni/android_util_Binder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index 7f7cfce..5d7dbe8 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -1232,7 +1232,7 @@ static const JNINativeMethod gBinderProxyMethods[] = { {"pingBinder", "()Z", (void*)android_os_BinderProxy_pingBinder}, {"isBinderAlive", "()Z", (void*)android_os_BinderProxy_isBinderAlive}, {"getInterfaceDescriptor", "()Ljava/lang/String;", (void*)android_os_BinderProxy_getInterfaceDescriptor}, - {"transact", "(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z", (void*)android_os_BinderProxy_transact}, + {"transactNative", "(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z", (void*)android_os_BinderProxy_transact}, {"linkToDeath", "(Landroid/os/IBinder$DeathRecipient;I)V", (void*)android_os_BinderProxy_linkToDeath}, {"unlinkToDeath", "(Landroid/os/IBinder$DeathRecipient;I)Z", (void*)android_os_BinderProxy_unlinkToDeath}, {"destroy", "()V", (void*)android_os_BinderProxy_destroy}, |