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

Commit 62edc960 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 6383 into donut 

* changes:
  Cleanup connection when airplane mode is entered.
parents 7bf9f930 024af038

telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ final class CdmaServiceStateTracker extends ServiceStateTracker { 
            Message msg = dcTracker.obtainMessage(DataConnectionTracker.EVENT_CLEAN_UP_CONNECTION);

            msg.arg1 = 1; // tearDown is true

            msg.obj = CDMAPhone.REASON_RADIO_TURNED_OFF;

            sendMessage(msg);

            dcTracker.sendMessage(msg);



            // Poll data state up to 15 times, with a 100ms delay

            // totaling 1.5 sec. Normal data disable action will finish in 100ms.

telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
            Message msg = dcTracker.obtainMessage(DataConnectionTracker.EVENT_CLEAN_UP_CONNECTION);

            msg.arg1 = 1; // tearDown is true

            msg.obj = GSMPhone.REASON_RADIO_TURNED_OFF;

            sendMessage(msg);

            dcTracker.sendMessage(msg);



            // poll data state up to 15 times, with a 100ms delay

            // totaling 1.5 sec. Normal data disable action will finish in 100ms.