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

Commit 26990f7b authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance"... 

Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" into pi-dev am: 1be03922
am: 5327a389

Change-Id: I17bf7649f1bf09873064937f5d81f9910aeffcac
parents b06106fe 5327a389

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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

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

     */