diff options
| author | Marco Nelissen <marcone@google.com> | 2014-11-17 18:24:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 18:24:54 +0000 |
| commit | e726680652ecd235496afeb3207b463e0aa83955 (patch) | |
| tree | baf93d27f595a5be32d77c377d7571985a1a9ca1 /core/jni/android_view_Surface.cpp | |
| parent | 101bf2a0883d0b799c9c515af4e2297d0cf21394 (diff) | |
| parent | 52e2b6f79d44ff289c97653edea0548352c2f55b (diff) | |
| download | frameworks_base-e726680652ecd235496afeb3207b463e0aa83955.zip frameworks_base-e726680652ecd235496afeb3207b463e0aa83955.tar.gz frameworks_base-e726680652ecd235496afeb3207b463e0aa83955.tar.bz2 | |
am 52e2b6f7: Merge "Update calls to IInterface::asBinder()"
* commit '52e2b6f79d44ff289c97653edea0548352c2f55b':
Update calls to IInterface::asBinder()
Diffstat (limited to 'core/jni/android_view_Surface.cpp')
| -rw-r--r-- | core/jni/android_view_Surface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp index a39ff8e..b3a9b05 100644 --- a/core/jni/android_view_Surface.cpp +++ b/core/jni/android_view_Surface.cpp @@ -324,7 +324,7 @@ static jlong nativeReadFromParcel(JNIEnv* env, jclass clazz, // update the Surface only if the underlying IGraphicBufferProducer // has changed. if (self != NULL - && (self->getIGraphicBufferProducer()->asBinder() == binder)) { + && (IInterface::asBinder(self->getIGraphicBufferProducer()) == binder)) { // same IGraphicBufferProducer, return ourselves return jlong(self.get()); } @@ -354,7 +354,7 @@ static void nativeWriteToParcel(JNIEnv* env, jclass clazz, return; } sp<Surface> self(reinterpret_cast<Surface *>(nativeObject)); - parcel->writeStrongBinder( self != 0 ? self->getIGraphicBufferProducer()->asBinder() : NULL); + parcel->writeStrongBinder( self != 0 ? IInterface::asBinder(self->getIGraphicBufferProducer()) : NULL); } static jint nativeGetWidth(JNIEnv* env, jclass clazz, jlong nativeObject) { |