Merge "SamsungRIL: clean up and re-organization" into ics (cebc0ce5) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/SamsungRIL.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -230,13 +230,9 @@ 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);
		@@ -248,6 +244,10 @@ public class SamsungRIL extends RIL implements CommandsInterface {
		rr.release();
		return;
		}
		} else {
		rr.onError(error, ret);
		rr.release();
		return;
		}
		}