Remove ParcelSurfaceTexture and update MediaPlayer

This removes the ParcelSurfaceTexture class since that functionality has been
folded into Surface.java. The change also updates the MediaPlayer to get rid
of setParcelSurfaceTexture() and modifies setTexture() to use the new Surface
functionality in order to simplify the code.

Change-Id: Iafa75ea3188263928128325d8a726786971b4de4

1 files changed, 1 insertions, 9 deletions

diff --git a/native/android/native_window.cpp b/native/android/native_window.cpp
index 36fc9bf..d266fc6 100644
--- a/native/android/native_window.cpp
+++ b/native/android/native_window.cpp
@@ -20,20 +20,12 @@
 #include <android/native_window_jni.h>
 #include <surfaceflinger/Surface.h>
 #include <android_runtime/android_view_Surface.h>
-#include <android_runtime/android_graphics_ParcelSurfaceTexture.h>
 #include <android_runtime/android_graphics_SurfaceTexture.h>
 
 using namespace android;
 
 ANativeWindow* ANativeWindow_fromSurface(JNIEnv* env, jobject surface) {
-    sp<ANativeWindow> win;
-    if (android_Surface_isInstanceOf(env, surface)) {
-        win = android_Surface_getNativeWindow(env, surface);
-    } else if (android_SurfaceTexture_isInstanceOf(env, surface)) {
-        win = android_SurfaceTexture_getNativeWindow(env, surface);
-    } else if (android_ParcelSurfaceTexture_isInstanceOf(env, surface)) {
-        win = android_ParcelSurfaceTexture_getNativeWindow(env, surface);
-    }
+    sp<ANativeWindow> win = android_Surface_getNativeWindow(env, surface);
     if (win != NULL) {
         win->incStrong((void*)ANativeWindow_acquire);
     }