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

Commit 54caf1a3 authored by Nazanin Bakhshi's avatar Nazanin Bakhshi Committed by android-build-merger
Browse files

Merge "Send an async request to modem each time getModemStatus is called to... 

Merge "Send an async request to modem each time getModemStatus is called to eventually update the modemStatus, and not rely on stale cached value" into qt-r1-dev am: 72f9974c
am: 5d3bcb8e

Change-Id: I8046164ba90df714ac0701df8df7f48df1da4ea6
parents 6d63603b 5d3bcb8e

src/java/com/android/internal/telephony/PhoneConfigurationManager.java

+3 −1
Original line number Diff line number Diff line
@@ -208,12 +208,14 @@ public class PhoneConfigurationManager { 
        try {

            return getPhoneStatusFromCache(phoneId);

        } catch (NoSuchElementException ex) {

            updatePhoneStatus(phone);

            // Return true if modem status cannot be retrieved. For most cases, modem status

            // is on. And for older version modems, GET_MODEM_STATUS and disable modem are not

            // supported. Modem is always on.

            //TODO: this should be fixed in R to support a third status UNKNOWN b/131631629

            return true;

        } finally {

            //in either case send an asynchronous request to retrieve the phone status

            updatePhoneStatus(phone);

        }

    }