commit 38003474abcab84ee7d4fa33d070532f7bd75c68
author zoey chen <zoeychen@google.com> Fri Dec 13 17:16:31 2019 +0800
committer zoey chen <zoeychen@google.com> Fri Dec 13 17:16:31 2019 +0800
tree b1b829b648903e7ba3ddd37577e8222f8d8c13c3
parent 4caeb307a4f72d14b025f90b7e85a7efd078675e

[TelephonyMainline] Rename getMergedSubscriberIdsFromGroup from Telephony perspective

Bug: 145584030
Test: make
Change-Id: Ia491c01135ea8a416676ce6b02951197b35ea4fd

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 21c8975..b9831de 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5513,8 +5513,8 @@
     }
 
     @Override
-    public String[] getMergedSubscriberIdsFromGroup(int subId, String callingPackage) {
-        enforceReadPrivilegedPermission("getMergedSubscriberIdsFromGroup");
+    public String[] getMergedImsisFromGroup(int subId, String callingPackage) {
+        enforceReadPrivilegedPermission("getMergedImsisFromGroup");
 
         final long identity = Binder.clearCallingIdentity();
         try {
@@ -5523,7 +5523,7 @@
             String subscriberId = telephonyManager.getSubscriberId(subId);
             if (subscriberId == null) {
                 if (DBG) {
-                    log("getMergedSubscriberIdsFromGroup can't find subscriberId for subId "
+                    log("getMergedImsisFromGroup can't find subscriberId for subId "
                             + subId);
                 }
                 return null;