am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." into honeycomb

* commit '6df89fde0db446bb530ab872b373b1faa3ccb06c': Ignore errors returned from native_window_set_crop.
2011-01-26 12:09:56 -08:00
parent 83af70126f 6df89fde0d
commit 1a6e6d55b8
1 changed files with 3 additions and 2 deletions
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -2203,8 +2203,9 @@ void OMXCodec::onEvent(OMX_EVENTTYPE event, OMX_U32 data1, OMX_U32 data2) {
                        crop.right = right;
                        crop.bottom = bottom;

-                        CHECK_EQ(0, native_window_set_crop(
-                                    mNativeWindow.get(), &crop));
+                        // We'll ignore any errors here, if the surface is
+                        // already invalid, we'll know soon enough.
+                        native_window_set_crop(mNativeWindow.get(), &crop);
                    }
                }
            }