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

Commit cfe9e61c authored by Shuo Qian's avatar Shuo Qian
Browse files

ECBM SystemProperty cleanup 

- Add getEmergencyCallbackMode() method in the TelephonyManager.java
to get the boolean value for ECBM callback mode from the phone through
ITelephony.aidl/java interface

- Use the added TelephonyManager Api to replace the 'get' of
PROPERTY_INECM_MODE system property in the framework/base

Change-Id: I83fbdeef5c0b43a8fc16ece044c9e191e9922bce
Test: manual
Bug: 30361624
parent c240c9b1

location/java/com/android/internal/location/GpsNetInitiatedHandler.java

+1 −2
Original line number Diff line number Diff line
@@ -242,8 +242,7 @@ public class GpsNetInitiatedHandler { 
    }



    public boolean getInEmergency() {

        boolean isInEmergencyCallback = Boolean.parseBoolean(

                SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE));

        boolean isInEmergencyCallback = mTelephonyManager.getEmergencyCallbackMode();

        return mIsInEmergency || isInEmergencyCallback;

    }

telephony/java/android/telephony/TelephonyManager.java

+28 −0
Original line number Diff line number Diff line
@@ -6478,5 +6478,33 @@ public class TelephonyManager { 


        return null;

    }



    /**

     * Check if phone is in emergency callback mode

     * @return true if phone is in emergency callback mode

     * @hide

     */

    public boolean getEmergencyCallbackMode() {

        return getEmergencyCallbackMode(getSubId());

    }



    /**

     * Check if phone is in emergency callback mode

     * @return true if phone is in emergency callback mode

     * @param subId the subscription ID that this action applies to.

     * @hide

     */

    public boolean getEmergencyCallbackMode(int subId) {

        try {

            ITelephony telephony = getITelephony();

            if (telephony == null) {

                return false;

            }

            return telephony.getEmergencyCallbackMode(subId);

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelephony#getEmergencyCallbackMode", e);

        }

        return false;

    }

}

telephony/java/com/android/internal/telephony/ITelephony.aidl

+8 −0
Original line number Diff line number Diff line
@@ -1316,4 +1316,12 @@ interface ITelephony { 
     * @param appType the icc application type, like {@link #APPTYPE_USIM}

     */

    String[] getForbiddenPlmns(int subId, int appType);



    /**

     * Check if phone is in emergency callback mode

     * @return true if phone is in emergency callback mode

     * @param subId the subscription ID that this action applies to.

     * @hide

     */

    boolean getEmergencyCallbackMode(int subId);

}