From aa861666ed537389e335f586bc84fe8ddb9fb026 Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Tue, 21 Apr 2015 10:24:32 -0400
Subject: [PATCH] Fix build.

Change-Id: I0e419fdb36cedba67fc6da7f71134d9728f66150
---
 core/java/android/os/Parcel.java | 2 +-
 core/jni/android_os_Parcel.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index 77c50877978b5..af23f11e441b3 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -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>() {
diff --git a/core/jni/android_os_Parcel.cpp b/core/jni/android_os_Parcel.cpp
index c2a9bbde51133..a3a0551826900 100644
--- a/core/jni/android_os_Parcel.cpp
+++ b/core/jni/android_os_Parcel.cpp
@@ -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";