Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" into pi-dev

telephony/java/android/telephony/TelephonyManager.java

@@ -2968,7 +2968,7 @@ public class TelephonyManager {
             IPhoneSubInfo info = getSubscriberInfo();
             if (info == null)
                 return null;
-            return info.getGroupIdLevel1(mContext.getOpPackageName());
+            return info.getGroupIdLevel1ForSubscriber(getSubId(), mContext.getOpPackageName());
         } catch (RemoteException ex) {
             return null;
         } catch (NullPointerException ex) {

telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl

@@ -67,11 +67,6 @@ interface IPhoneSubInfo {
      */
     String getSubscriberIdForSubscriber(int subId, String callingPackage);
 
-    /**
-     * Retrieves the Group Identifier Level1 for GSM phones.
-     */
-    String getGroupIdLevel1(String callingPackage);
-
     /**
      * Retrieves the Group Identifier Level1 for GSM phones of a subId.
      */