diff options
| author | Andreas Huber <andih@google.com> | 2013-08-28 08:54:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-28 08:54:36 -0700 |
| commit | cb18b6987bb3c928b2ec69e344923b427ed39627 (patch) | |
| tree | f802866295baf6451e52598ce8db53a53f8d3a14 /media/libstagefright/rtsp/ARTSPConnection.cpp | |
| parent | 677d2d3d4b212c81e4d3738794044711dca8ec8f (diff) | |
| parent | af66fae15f8c386ad884e5fa83db4eaef4c4f2ee (diff) | |
| download | frameworks_av-cb18b6987bb3c928b2ec69e344923b427ed39627.zip frameworks_av-cb18b6987bb3c928b2ec69e344923b427ed39627.tar.gz frameworks_av-cb18b6987bb3c928b2ec69e344923b427ed39627.tar.bz2 | |
am af66fae1: am fb949d5d: Merge "Fix crash in MyHandler when sockets are not set."
* commit 'af66fae15f8c386ad884e5fa83db4eaef4c4f2ee':
Fix crash in MyHandler when sockets are not set.
Diffstat (limited to 'media/libstagefright/rtsp/ARTSPConnection.cpp')
| -rw-r--r-- | media/libstagefright/rtsp/ARTSPConnection.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/libstagefright/rtsp/ARTSPConnection.cpp b/media/libstagefright/rtsp/ARTSPConnection.cpp index 5116550..efde7a9 100644 --- a/media/libstagefright/rtsp/ARTSPConnection.cpp +++ b/media/libstagefright/rtsp/ARTSPConnection.cpp @@ -489,7 +489,6 @@ void ARTSPConnection::onReceiveResponse() { FD_SET(mSocket, &rs); int res = select(mSocket + 1, &rs, NULL, NULL, &tv); - CHECK_GE(res, 0); if (res == 1) { MakeSocketBlocking(mSocket, true); |