diff options
| author | Andreas Huber <andih@google.com> | 2010-08-27 13:46:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-27 13:46:14 -0700 |
| commit | e25e03612e1a2988ed83f24d2658cf0898fd1944 (patch) | |
| tree | fdd1abdc68d11a2970331d9530e6444d8bbb3765 /media | |
| parent | 053d5ce992d54e6cedf018001f9eda7c4cb24c6a (diff) | |
| parent | e250c220d1bb3bd117641add94ee7465a82f085c (diff) | |
| download | frameworks_base-e25e03612e1a2988ed83f24d2658cf0898fd1944.zip frameworks_base-e25e03612e1a2988ed83f24d2658cf0898fd1944.tar.gz frameworks_base-e25e03612e1a2988ed83f24d2658cf0898fd1944.tar.bz2 | |
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.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/rtsp/MyHandler.h | 3 |
1 files changed, 1 insertions, 2 deletions
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 @@ struct MyHandler : public AHandler { { if (mFirstAccessUnit) { LOG(WARNING) << "Never received any data, disconnecting."; - + (new AMessage('abor', id()))->post(); } - (new AMessage('abor', id()))->post(); break; } |