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

Commit 5e4c95b7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Added getActiveSubInfoCount" am: f74b6baf 

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



Change-Id: Ie1b4435df0ec5ca7237c125e40c0494e39b7519a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7bed085 f74b6baf

telephony/java/android/telephony/SubscriptionManager.java

+4 −11
Original line number Diff line number Diff line
@@ -1743,8 +1743,7 @@ public class SubscriptionManager { 
     *

     * <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}

     * or that the calling app has carrier privileges (see

     * {@link TelephonyManager#hasCarrierPrivileges}). In the latter case, only records accessible

     * to the calling app are returned.

     * {@link TelephonyManager#hasCarrierPrivileges}).

     *

     * @return Sorted list of the currently {@link SubscriptionInfo} records available on the device.

     * <ul>
@@ -1762,7 +1761,6 @@ public class SubscriptionManager { 
     * </li>

     * </ul>

     */

    @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    public List<SubscriptionInfo> getActiveSubscriptionInfoList() {

        return getActiveSubscriptionInfoList(/* userVisibleonly */true);
@@ -1966,17 +1964,12 @@ public class SubscriptionManager { 
    }



    /**

     * Get the active subscription count.

     *

     * Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}

     * or that the calling app has carrier privileges (see

     * {@link TelephonyManager#hasCarrierPrivileges}). In the latter case, the count will include

     * only those subscriptions accessible to the caller.

     * @return The current number of active subscriptions.

     *

     * @return the current number of active subscriptions. There is no guarantee the value

     * returned by this method will be the same as the length of the list returned by

     * {@link #getActiveSubscriptionInfoList}.

     * @see #getActiveSubscriptionInfoList()

     */

    @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    public int getActiveSubscriptionInfoCount() {

        int result = 0;