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

Commit fc7e5957 authored by Nathan Harold's avatar Nathan Harold
Browse files

Remove sysprop based radio reset sync mechanism 

This CL removes the gsm.radioreset system property that
could ostensibly be used to initiate an out-of-band
radio reset, which relies on both the framework and OEM
code to synchronously write the value of the gsm.radioreset
system property.

This property isn't being used by any vendor implementations
that are currently active, unless that usage is obfuscated
within binaries.

Bug: 64444973
Test: compilation
Change-Id: I5837d01d1d949ebf57a2d25f9a6fb52ed9f6db94
parent d6ed1211

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+1 −22
Original line number Diff line number Diff line
@@ -149,8 +149,6 @@ public class DcTracker extends Handler { 
    private static final boolean DATA_STALL_SUSPECTED = true;

    private static final boolean DATA_STALL_NOT_SUSPECTED = false;



    private String RADIO_RESET_PROPERTY = "gsm.radioreset";



    private static final String INTENT_RECONNECT_ALARM =

            "com.android.internal.telephony.data-reconnect";

    private static final String INTENT_RECONNECT_ALARM_EXTRA_TYPE = "reconnect_alarm_extra_type";
@@ -4558,13 +4556,11 @@ public class DcTracker extends Handler { 
        public static final int CLEANUP                 = 1;

        public static final int REREGISTER              = 2;

        public static final int RADIO_RESTART           = 3;

        public static final int RADIO_RESTART_WITH_PROP = 4;



        private static boolean isAggressiveRecovery(int value) {

            return ((value == RecoveryAction.CLEANUP) ||

                    (value == RecoveryAction.REREGISTER) ||

                    (value == RecoveryAction.RADIO_RESTART) ||

                    (value == RecoveryAction.RADIO_RESTART_WITH_PROP));

                    (value == RecoveryAction.RADIO_RESTART));

        }

    }
@@ -4610,23 +4606,6 @@ public class DcTracker extends Handler { 
                EventLog.writeEvent(EventLogTags.DATA_STALL_RECOVERY_RADIO_RESTART,

                        mSentSinceLastRecv);

                if (DBG) log("restarting radio");

                putRecoveryAction(RecoveryAction.RADIO_RESTART_WITH_PROP);

                restartRadio();

                break;

            case RecoveryAction.RADIO_RESTART_WITH_PROP:

                // This is in case radio restart has not recovered the data.

                // It will set an additional "gsm.radioreset" property to tell

                // RIL or system to take further action.

                // The implementation of hard reset recovery action is up to OEM product.

                // Once RADIO_RESET property is consumed, it is expected to set back

                // to false by RIL.

                EventLog.writeEvent(EventLogTags.DATA_STALL_RECOVERY_RADIO_RESTART_WITH_PROP, -1);

                if (DBG) log("restarting radio with gsm.radioreset to true");

                SystemProperties.set(RADIO_RESET_PROPERTY, "true");

                // give 1 sec so property change can be notified.

                try {

                    Thread.sleep(1000);

                } catch (InterruptedException e) {}

                restartRadio();

                putRecoveryAction(RecoveryAction.GET_DATA_CALL_LIST);

                break;