diff options
| author | James Dong <jdong@google.com> | 2011-04-01 14:06:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-01 14:06:56 -0700 |
| commit | 55311e8d13cd3925185d3db4f3f32f2afd615667 (patch) | |
| tree | b727db1239b4372198731f0fc9428660107fa5f2 /media | |
| parent | 1aebc47141246510ab2629cc985aca3a4c32c130 (diff) | |
| parent | a93f84e067f02c319c69a114e219006507d1b4f4 (diff) | |
| download | frameworks_base-55311e8d13cd3925185d3db4f3f32f2afd615667.zip frameworks_base-55311e8d13cd3925185d3db4f3f32f2afd615667.tar.gz frameworks_base-55311e8d13cd3925185d3db4f3f32f2afd615667.tar.bz2 | |
Merge "ISurfaceTexture does not have a method getIdentity()"
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/android_media_MediaPlayer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index 6d074e9..0f9cbec 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -317,8 +317,7 @@ static void setVideoSurfaceOrSurfaceTexture( if (surfaceTexture != NULL) { sp<ISurfaceTexture> native_surfaceTexture( getSurfaceTexture(env, surfaceTexture)); - LOGV("%s: texture=%p (id=%d)", prefix, - native_surfaceTexture.get(), native_surfaceTexture->getIdentity()); + LOGV("%s: texture=%p", prefix, native_surfaceTexture.get()); mp->setVideoSurfaceTexture(native_surfaceTexture); } } |