diff options
| author | Daniel Bateman <jetison.24@gmail.com> | 2012-04-17 03:01:20 -0500 |
|---|---|---|
| committer | Daniel Bateman <jetison.24@gmail.com> | 2012-04-17 03:01:20 -0500 |
| commit | 5ef5b1ae8250d96400a38e7f09fd38149c912734 (patch) | |
| tree | 7a779bdd03e4241ed14e9e08f00cf7705ee1701a /telephony | |
| parent | d628aa068e0530070767b42f7c63c98c8f0fc446 (diff) | |
| download | frameworks_base-5ef5b1ae8250d96400a38e7f09fd38149c912734.zip frameworks_base-5ef5b1ae8250d96400a38e7f09fd38149c912734.tar.gz frameworks_base-5ef5b1ae8250d96400a38e7f09fd38149c912734.tar.bz2 | |
SamsungRIL: clean up and re-organization
Clean up some messy code in the Samsung RIL.
Change-Id: If8bc9c0e4264de5919be1b6a858896076c879708
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/SamsungRIL.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/telephony/java/com/android/internal/telephony/SamsungRIL.java b/telephony/java/com/android/internal/telephony/SamsungRIL.java index 38ae600..5f379de 100644 --- a/telephony/java/com/android/internal/telephony/SamsungRIL.java +++ b/telephony/java/com/android/internal/telephony/SamsungRIL.java @@ -230,16 +230,12 @@ public class SamsungRIL extends RIL implements CommandsInterface { } if (error != 0) { - //ugly fix for Samsung messing up SMS_SEND request fail in binary RIL - if(!(error == -1 && rr.mRequest == RIL_REQUEST_SEND_SMS)) + // Ugly fix for Samsung messing up SMS_SEND request fail in binary RIL + if (error == -1 && rr.mRequest == RIL_REQUEST_SEND_SMS) { - rr.onError(error, ret); - rr.release(); - return; - } else { try { - ret = responseSMS(p); + ret = responseSMS(p); } catch (Throwable tr) { Log.w(LOG_TAG, rr.serialString() + "< " + requestToString(rr.mRequest) @@ -248,6 +244,10 @@ public class SamsungRIL extends RIL implements CommandsInterface { rr.release(); return; } + } else { + rr.onError(error, ret); + rr.release(); + return; } } |