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

Commit 4b2604d3 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

resolve merge conflicts of 17c69f54 to pi-dev-plus-aosp 

Bug: 120986348
Bug: 120945804
Test: Treehugger
Merged-In: I4d7a203dd57050535867329c8dc36f8c75667c15
Change-Id: Ia2378265df93dd6b605b1b4af53e415c6ded1faf
parents d8314407 17c69f54

api/system-current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -5623,6 +5623,7 @@ package android.telephony { 
    method public deprecated boolean getDataEnabled(int);

    method public deprecated boolean getDataEnabled(int);

    method public boolean getEmergencyCallbackMode();

    method public boolean getEmergencyCallbackMode();

    method public java.lang.String getIsimDomain();

    method public java.lang.String getIsimDomain();

    method public java.lang.String getIsimIst();

    method public int getRadioPowerState();

    method public int getRadioPowerState();

    method public int getSimApplicationState();

    method public int getSimApplicationState();

    method public int getSimCardState();

    method public int getSimCardState();
@@ -6158,6 +6159,7 @@ package android.telephony.ims { 
  public class ImsMmTelManager {

  public class ImsMmTelManager {

    method public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(android.content.Context, int);

    method public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(android.content.Context, int);

    method public int getVoWiFiModeSetting();

    method public int getVoWiFiModeSetting();

    method public int getVoWiFiRoamingModeSetting();

    method public boolean isAdvancedCallingSettingEnabled();

    method public boolean isAdvancedCallingSettingEnabled();

    method public boolean isAvailable(int, int);

    method public boolean isAvailable(int, int);

    method public boolean isCapable(int, int);

    method public boolean isCapable(int, int);

telephony/java/android/telephony/TelephonyManager.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -5877,9 +5877,14 @@ public class TelephonyManager { 




    /**

    /**

     * Returns the IMS Service Table (IST) that was loaded from the ISIM.

     * Returns the IMS Service Table (IST) that was loaded from the ISIM.

     *

     * See 3GPP TS 31.103 (Section 4.2.7) for the definition and more information on this table.

     *

     * @return IMS Service Table or null if not present or not loaded

     * @return IMS Service Table or null if not present or not loaded

     * @hide

     * @hide

     */

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public String getIsimIst() {

    public String getIsimIst() {

        try {

        try {

            IPhoneSubInfo info = getSubscriberInfo();

            IPhoneSubInfo info = getSubscriberInfo();

telephony/java/android/telephony/ims/ImsMmTelManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -714,7 +714,7 @@ public class ImsMmTelManager { 
     * @see #setVoWiFiRoamingSetting(boolean)

     * @see #setVoWiFiRoamingSetting(boolean)

     */

     */

    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @WiFiCallingMode int getVoWiFiRoamingModeSetting() {

    public @WiFiCallingMode int getVoWiFiRoamingModeSetting() {

        try {

        try {

            return getITelephony().getVoWiFiRoamingModeSetting(mSubId);

            return getITelephony().getVoWiFiRoamingModeSetting(mSubId);

        } catch (RemoteException e) {

        } catch (RemoteException e) {