From 5cdff411cefa92b4ea86b1f318a3ef73cf8c8599 Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Thu, 8 Apr 2021 17:00:08 +0800 Subject: [PATCH] [Telephony] API Review: getMergedImsisFromGroup - Add more description in getMergedImsisFromGroup - Remove NPE Bug: 167347923 Test: make Change-Id: I66fccc73f4bc184b36e58149b643ea37853595b3 --- telephony/java/android/telephony/TelephonyManager.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 75c80313cd12c..f0771bedc8388 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -4883,11 +4883,10 @@ public class TelephonyManager { /** * Return the set of IMSIs that should be considered "merged together" for data usage - * purposes. Unlike {@link #getMergedSubscriberIds()} this API merge IMSIs based on - * subscription grouping: IMSI of those in the same group will all be returned. - * Return the current IMSI if there is no subscription group. - * - *

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