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

Commit e92ce14e authored by Malcolm Chen's avatar Malcolm Chen
Browse files

Add a @hide API to indicate 5G and DSDS conflict. 

Bug: 152786064
Test: build and manual
Change-Id: I79a8fda5b70a31acc365ebcbb03b73b20d2443fd
parent 855ae008

telephony/java/android/telephony/TelephonyManager.java

+17 −0
Original line number Diff line number Diff line
@@ -13238,4 +13238,21 @@ public class TelephonyManager { 
    public static void enableServiceHandleCaching() {

        sServiceHandleCacheEnabled = true;

    }



    /**

     * Whether device can connect to 5G network when two SIMs are active.

     * @hide

     * TODO b/153669716: remove or make system API.

     */

    public boolean canConnectTo5GInDsdsMode() {

        ITelephony telephony = getITelephony();

        if (telephony == null) return true;

        try {

            return telephony.canConnectTo5GInDsdsMode();

        } catch (RemoteException ex) {

            return true;

        } catch (NullPointerException ex) {

            return true;

        }

    }

}

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

+5 −0
Original line number Diff line number Diff line
@@ -2268,4 +2268,9 @@ interface ITelephony { 
     * @return operatorinfo on success

     */

    String getManualNetworkSelectionPlmn(int subId);



    /**

     * Whether device can connect to 5G network when two SIMs are active.

     */

    boolean canConnectTo5GInDsdsMode();

}