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

Commit 1be03922 authored by Chen Xu's avatar Chen Xu Committed by Android (Google) Code Review
Browse files

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

parents 4e0fc234 272e8cf8

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2968,7 +2968,7 @@ public class TelephonyManager { 
            IPhoneSubInfo info = getSubscriberInfo();

            IPhoneSubInfo info = getSubscriberInfo();

            if (info == null)

            if (info == null)

                return null;

                return null;

            return info.getGroupIdLevel1(mContext.getOpPackageName());

            return info.getGroupIdLevel1ForSubscriber(getSubId(), mContext.getOpPackageName());

        } catch (RemoteException ex) {

        } catch (RemoteException ex) {

            return null;

            return null;

        } catch (NullPointerException ex) {

        } catch (NullPointerException ex) {

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

+0 −5
Original line number Original line Diff line number Diff line
@@ -67,11 +67,6 @@ interface IPhoneSubInfo { 
     */

     */

    String getSubscriberIdForSubscriber(int subId, String callingPackage);

    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.

     * Retrieves the Group Identifier Level1 for GSM phones of a subId.

     */

     */