Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix build."

Browse Source
This commit is contained in:
Dan Sandler
2015-04-21 14:31:39 +00:00
committed by Android (Google) Code Review
parent 0fa9987b5b aa861666ed
commit 225d06624a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/Parcel.java
View File

@@ -283,7 +283,7 @@ public final class Parcel {
private static native void nativeWriteInterfaceToken(long nativePtr, String interfaceName);
private static native void nativeEnforceInterface(long nativePtr, String interfaceName);
private static native long nativeGetAshmemSize(long nativePtr);
private static native long nativeGetBlobAshmemSize(long nativePtr);
public final static Parcelable.Creator<String> STRING_CREATOR
= new Parcelable.Creator<String>() {

2
core/jni/android_os_Parcel.cpp
View File

@@ -766,7 +766,7 @@ static const JNINativeMethod gParcelMethods[] = {
{"getGlobalAllocSize", "()J", (void*)android_os_Parcel_getGlobalAllocSize},
{"getGlobalAllocCount", "()J", (void*)android_os_Parcel_getGlobalAllocCount},
{"nativeGetAshmemSize", "(J)J", (void*)android_os_Parcel_getAshmemSize},
{"nativeGetBlobAshmemSize", "(J)J", (void*)android_os_Parcel_getBlobAshmemSize},
};
const char* const kParcelPathName = "android/os/Parcel";