commit 482989a7c92215953f25293c92b3d0fe2e87cb41
author James Dong <jdong@google.com> Mon Sep 17 14:44:15 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 17 14:44:15 2012 -0700
tree ca3c9b5b8dc18051d001a8c9b172150eabda7306
parent 628335809726683ce13d49d51ab51ef984933a13
parent d71866b18e387ddcff6ff8128866ecae45ec1606

am 9568b4cd: am 376074ed: Fixed a native crash due to deref of a NULL pointer

* commit '9568b4cdc8d2a7896e9c031f2b6cdf6f18210de1':
  Fixed a native crash due to deref of a NULL pointer

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index c09f86f..756e76a 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -961,7 +961,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) {