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

Merge "[Telephony] API Review: getMergedImsisFromGroup" into sc-dev

Browse Source
This commit is contained in:
Zoey Chen
2021-04-13 02:50:51 +00:00
committed by Android (Google) Code Review
parent 5a71c4f7fa 5cdff411ce
commit e2f123e1a4
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -4883,11 +4883,10 @@ public class TelephonyManager {
/** /**
* Return the set of IMSIs that should be considered "merged together" for data usage * Return the set of IMSIs that should be considered "merged together" for data usage
* purposes. Unlike {@link #getMergedSubscriberIds()} this API merge IMSIs based on * purposes. This API merges IMSIs based on subscription grouping: IMSI of those in the same
* subscription grouping: IMSI of those in the same group will all be returned. * group will all be returned.
* Return the current IMSI if there is no subscription group. * Return the current IMSI if there is no subscription group. See
* * {@link SubscriptionManager#createSubscriptionGroup(List)} for the definition of a group.
* <p>Requires the calling app to have READ_PRIVILEGED_PHONE_STATE permission.
* *
* @hide * @hide
*/ */
@@ -4900,7 +4899,6 @@ public class TelephonyManager {
return telephony.getMergedImsisFromGroup(getSubId(), getOpPackageName()); return telephony.getMergedImsisFromGroup(getSubId(), getOpPackageName());
} }
} catch (RemoteException ex) { } catch (RemoteException ex) {
} catch (NullPointerException ex) {
} }
return new String[0]; return new String[0];
} }