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

Commit 83e7b920 authored by Pengquan Meng's avatar Pengquan Meng
Browse files

Add getSlotsMapping to TelephonyManager 

Bug: 123101769
Test: build
Change-Id: I416d741947b1a15e66ebf71b8104c4b2ec95e310
parent e0e205bb

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7931,6 +7931,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<android.util.Pair<java.lang.Integer,java.lang.Integer>> getLogicalToPhysicalSlotMapping();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getPreferredNetworkTypeBitmap();

    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public int getRadioPowerState();

    method public int getSimApplicationState();

telephony/java/android/telephony/TelephonyManager.java

+30 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import android.telephony.ims.feature.MmTelFeature; 
import android.telephony.ims.stub.ImsRegistrationImplBase;

import android.text.TextUtils;

import android.util.Log;

import android.util.Pair;



import com.android.ims.internal.IImsServiceFeatureCallback;

import com.android.internal.annotations.VisibleForTesting;
@@ -3264,6 +3265,35 @@ public class TelephonyManager { 
        }

    }



    /**

     * Get the mapping from logical slots to physical slots. The mapping represent by a pair list.

     * The key of the piar is the logical slot id and the value of the pair is the physical

     * slots id mapped to this logical slot id.

     *

     * @return an pair list indicates the mapping from logical slots to physical slots. The size of

     * the list should be {@link #getPhoneCount()} if success, otherwise return an empty list.

     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @NonNull

    public List<Pair<Integer, Integer>> getLogicalToPhysicalSlotMapping() {

        List<Pair<Integer, Integer>> slotMapping = new ArrayList<>();

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                int[] slotMappingArray = telephony.getSlotsMapping();

                for (int i = 0; i < slotMappingArray.length; i++) {

                    slotMapping.add(new Pair(i, slotMappingArray[i]));

                }

            }

        } catch (RemoteException e) {

            Log.e(TAG, "getSlotsMapping RemoteException", e);

        }

        return slotMapping;

    }



    //

    //

    // Subscriber Info

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

+6 −0
Original line number Diff line number Diff line
@@ -1848,8 +1848,14 @@ interface ITelephony { 
     * @hide

     */

    int getNumOfActiveSims();



    /**

     * Get if reboot is required upon altering modems configurations

     */

    boolean isRebootRequiredForModemConfigChange();



    /**

     * Get the mapping from logical slots to physical slots.

     */

    int[] getSlotsMapping();

}