summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-07-20 10:47:04 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-20 10:47:04 -0700
commit60c93010e8f96a179574ec66c00ec47a675319e3 (patch)
tree17be9d6aa7a12b4f98ae0ff7dd22c33b15cd4c38
parent7dff060f29858d6db2464845bb9097ac5960bbe6 (diff)
parentbea47bc22b2939b324b47fd0d70e6c7e6fbc82d2 (diff)
downloadframeworks_av-60c93010e8f96a179574ec66c00ec47a675319e3.zip
frameworks_av-60c93010e8f96a179574ec66c00ec47a675319e3.tar.gz
frameworks_av-60c93010e8f96a179574ec66c00ec47a675319e3.tar.bz2
Merge "MediaPlayer: add a disconnect from ANativeWindow"
-rw-r--r--media/libmedia/mediaplayer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 178039c..ed6e3c7 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -84,6 +84,8 @@ void MediaPlayer::disconnect()
if (p != 0) {
p->disconnect();
}
+
+ disconnectNativeWindow();
}
// always call with lock held