am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error" (0a5ae453) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/RIL.java

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -360,6 +360,11 @@ public final class RIL extends BaseCommands implements CommandsInterface {
	rr.onError(GENERIC_FAILURE, null);		rr.onError(GENERIC_FAILURE, null);
	rr.release();		rr.release();
	}		}
			} finally {
			// Note: We are "Done" only if there are no outstanding
			// requests or replies. Thus this code path will only release
			// the wake lock on errors.
			releaseWakeLockIfDone();
	}		}

	if (!alreadySubtracted) {		if (!alreadySubtracted) {
	@@ -2044,6 +2049,12 @@ public final class RIL extends BaseCommands implements CommandsInterface {
	send(RILRequest rr) {		send(RILRequest rr) {
	Message msg;		Message msg;

			if (mSocket == null) {
			rr.onError(RADIO_NOT_AVAILABLE, null);
			rr.release();
			return;
			}

	msg = mSender.obtainMessage(EVENT_SEND, rr);		msg = mSender.obtainMessage(EVENT_SEND, rr);

	acquireWakeLock();		acquireWakeLock();