Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 225d0662 authored by Dan Sandler's avatar Dan Sandler Committed by Android (Google) Code Review
Browse files

Merge "Fix build."

parents 0fa9987b aa861666

core/java/android/os/Parcel.java

+1 −1
Original line number Diff line number Diff line
@@ -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>() {

core/jni/android_os_Parcel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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";