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

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

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

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

Change-Id: Ib31efe5c6bcf4902c29c183217e2737488863c4e
parents bac00612 e2f123e1

telephony/java/android/telephony/TelephonyManager.java

+4 −6
Original line number Diff line number Diff line
@@ -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.













     *













     * <p>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];















    }