Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3345f27f authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am cc41b92e: am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony:... 

am cc41b92e: am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"

* commit 'cc41b92e':
  frameworks/base/telephony: Release wakelock on RIL request send error
parents 5a242ec2 cc41b92e

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

+11 −0
Original line number Diff line number Diff line
@@ -359,6 +359,11 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
                            rr.onError(GENERIC_FAILURE, null);

                            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) {
@@ -2026,6 +2031,12 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
    send(RILRequest rr) {

        Message msg;



        if (mSocket == null) {

            rr.onError(RADIO_NOT_AVAILABLE, null);

            rr.release();

            return;

        }



        msg = mSender.obtainMessage(EVENT_SEND, rr);



        acquireWakeLock();