commit fac84ff8b33f85e9d9cdb65a7da1a7d37a969df6
author Android (Google) Code Review <android-gerrit@google.com> Fri Jul 10 11:39:29 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 10 11:39:29 2009 -0700
tree 2fafaafcb9500dea35f240c5bdec6a6312fac52c
parent 6d269be7f35bea7724ff9bf62b679223e4ebe438
parent 2521f47c4d45a4d02c3a9f608c73de744c8b44f6

Merge change 6711

* changes:
  Basic plumbing to retrieve metadata from the native player.

libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp

diff --git a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
index 5c522c5..21f87e3 100644
--- a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
+++ b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
@@ -219,7 +219,7 @@
     
 
     mDpiX = mNativeWindow->xdpi;
-    mDpiX = mNativeWindow->ydpi;
+    mDpiY = mNativeWindow->ydpi;
     mRefreshRate = fbDev->fps; 
     
     char property[PROPERTY_VALUE_MAX];

libs/surfaceflinger/SurfaceFlinger.cpp

diff --git a/libs/surfaceflinger/SurfaceFlinger.cpp b/libs/surfaceflinger/SurfaceFlinger.cpp
index 5ac1cfd..7a7574f 100644
--- a/libs/surfaceflinger/SurfaceFlinger.cpp
+++ b/libs/surfaceflinger/SurfaceFlinger.cpp
@@ -1212,6 +1212,13 @@
 {
     sp<LayerBaseClient> layer;
     sp<LayerBaseClient::Surface> surfaceHandle;
+
+    if (int32_t(w|h) < 0) {
+        LOGE("createSurface() failed, w or h is negative (w=%d, h=%d)",
+                int(w), int(h));
+        return surfaceHandle;
+    }
+    
     Mutex::Autolock _l(mStateLock);
     sp<Client> client = mClientsMap.valueFor(clientId);
     if (UNLIKELY(client == 0)) {