commit 874a4618b645ab5c1faaa738a871f52492f28de3
author Eino-Ville Talvala <etalvala@google.com> Mon Sep 17 08:37:25 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 17 08:37:25 2012 -0700
tree 486c6875f3ca1109438de8284140bf95480b01b6
parent 376074ed1c3c368aeb336954a07632cd806288e2
parent efb039e07c688c21122c938b008457bd4f555898

Merge "Camera2: Don't play shutter sound when doing a video snapshot" into jb-mr1-dev

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index dc1e351..1ddf775 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -963,7 +963,8 @@
 
 status_t NuPlayer::setVideoScalingMode(int32_t mode) {
     mVideoScalingMode = mode;
-    if (mNativeWindow != NULL) {
+    if (mNativeWindow != NULL
+            && mNativeWindow->getNativeWindow() != NULL) {
         status_t ret = native_window_set_scaling_mode(
                 mNativeWindow->getNativeWindow().get(), mVideoScalingMode);
         if (ret != OK) {