commit 6adecf466b58ceb3adac535b83a7505801f0f093
author Andreas Huber <andih@google.com> Fri Aug 27 13:46:14 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 27 13:46:14 2010 -0700
tree 4296f4d50fa19adc964481d952885752b16f072a
parent 95fd60f5f34ef63a9dbb12707c5c9cc771367565
parent 165dc4c486b8511402b3be508d5a577a774cdf59

am e250c220: Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread

Merge commit 'e250c220d1bb3bd117641add94ee7465a82f085c' into gingerbread-plus-aosp

* commit 'e250c220d1bb3bd117641add94ee7465a82f085c':
  We accidentally always aborted after 10 secs, even if the connection was fine.

media/libstagefright/rtsp/MyHandler.h

diff --git a/media/libstagefright/rtsp/MyHandler.h b/media/libstagefright/rtsp/MyHandler.h
index 4c6f058..b10c881 100644
--- a/media/libstagefright/rtsp/MyHandler.h
+++ b/media/libstagefright/rtsp/MyHandler.h
@@ -480,9 +480,8 @@
             {
                 if (mFirstAccessUnit) {
                     LOG(WARNING) << "Never received any data, disconnecting.";
-
+                    (new AMessage('abor', id()))->post();
                 }
-                (new AMessage('abor', id()))->post();
                 break;
             }