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

Commit b11b8ec3 authored by Zoey Chen's avatar Zoey Chen Committed by Automerger Merge Worker
Browse files

Merge "[TelephonyMainline] Make getMergedSubscriberIdsFromGroup as System API... 

Merge "[TelephonyMainline] Make getMergedSubscriberIdsFromGroup as System API and rename it" am: 7c8bda08

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1197840

Change-Id: I51c69153ac2ab5798235168678a1bf35be7f0d3b
parents 2a59e10d 7c8bda08

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9026,6 +9026,7 @@ package android.telephony { 
    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map<java.lang.Integer,java.lang.Integer> getLogicalToPhysicalSlotMapping();

    method public int getMaxNumberOfSimultaneouslyActiveSims();

    method public static long getMaxNumberVerificationTimeoutMillis();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String[] getMergedImsisFromGroup();

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

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

    method public int getSimApplicationState();

non-updatable-api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8924,6 +8924,7 @@ package android.telephony { 
    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map<java.lang.Integer,java.lang.Integer> getLogicalToPhysicalSlotMapping();

    method public int getMaxNumberOfSimultaneouslyActiveSims();

    method public static long getMaxNumberVerificationTimeoutMillis();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String[] getMergedImsisFromGroup();

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

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

    method public int getSimApplicationState();

packages/SettingsLib/src/com/android/settingslib/net/DataUsageUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class DataUsageUtils { 
        }



        final String[] mergedSubscriberIds = telephonyManager.createForSubscriptionId(subId)

                .getMergedSubscriberIdsFromGroup();

                .getMergedImsisFromGroup();



        if (ArrayUtils.isEmpty(mergedSubscriberIds)) {

            Log.i(TAG, "mergedSubscriberIds is null.");

packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageUtilsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ public class DataUsageUtilsTest { 
    public void getMobileTemplate_groupUuidNull_returnMobileAll() {

        when(mSubscriptionManager.getActiveSubscriptionInfo(SUB_ID)).thenReturn(mInfo1);

        when(mInfo1.getGroupUuid()).thenReturn(null);

        when(mTelephonyManager.getMergedSubscriberIdsFromGroup())

        when(mTelephonyManager.getMergedImsisFromGroup())

                .thenReturn(new String[] {SUBSCRIBER_ID});



        final NetworkTemplate networkTemplate = DataUsageUtils.getMobileTemplate(mContext, SUB_ID);
@@ -99,7 +99,7 @@ public class DataUsageUtilsTest { 
    public void getMobileTemplate_groupUuidExist_returnMobileMerged() {

        when(mSubscriptionManager.getActiveSubscriptionInfo(SUB_ID)).thenReturn(mInfo1);

        when(mInfo1.getGroupUuid()).thenReturn(mParcelUuid);

        when(mTelephonyManager.getMergedSubscriberIdsFromGroup())

        when(mTelephonyManager.getMergedImsisFromGroup())

                .thenReturn(new String[] {SUBSCRIBER_ID, SUBSCRIBER_ID_2});



        final NetworkTemplate networkTemplate = DataUsageUtils.getMobileTemplate(mContext, SUB_ID);

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1825,7 +1825,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
            }



            String[] mergedSubscriberId = ArrayUtils.defeatNullable(

                    tm.createForSubscriptionId(subId).getMergedSubscriberIdsFromGroup());

                    tm.createForSubscriptionId(subId).getMergedImsisFromGroup());

            mergedSubscriberIdsList.add(mergedSubscriberId);

        }