Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added getActiveSubInfoCount" am: f74b6baf67 am: 5e4c95b734

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

Change-Id: I17c121484c626ab2f9557bb93b386d2bd369b1ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-09 23:10:21 +00:00
committed by Automerger Merge Worker
parent e42f12f279 5e4c95b734
commit f7305e7643
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -1743,8 +1743,7 @@ public class SubscriptionManager {
* *
* <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} * <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
* or that the calling app has carrier privileges (see * or that the calling app has carrier privileges (see
* {@link TelephonyManager#hasCarrierPrivileges}). In the latter case, only records accessible * {@link TelephonyManager#hasCarrierPrivileges}).
* to the calling app are returned.
* *
* @return Sorted list of the currently {@link SubscriptionInfo} records available on the device. * @return Sorted list of the currently {@link SubscriptionInfo} records available on the device.
* <ul> * <ul>
@@ -1762,7 +1761,6 @@ public class SubscriptionManager {
* </li> * </li>
* </ul> * </ul>
*/ */
@SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
public List<SubscriptionInfo> getActiveSubscriptionInfoList() { public List<SubscriptionInfo> getActiveSubscriptionInfoList() {
return getActiveSubscriptionInfoList(/* userVisibleonly */true); 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} * @return The current number of active subscriptions.
* 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. There is no guarantee the value * @see #getActiveSubscriptionInfoList()
* returned by this method will be the same as the length of the list returned by
* {@link #getActiveSubscriptionInfoList}.
*/ */
@SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
public int getActiveSubscriptionInfoCount() { public int getActiveSubscriptionInfoCount() {
int result = 0; int result = 0;