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

Commit 5d3bcb8e 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

Change-Id: Icb8319a4c566b306470b382adbd4949f366a2d9d
parents fe181410 72f9974c

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);

        }

    }