From 4801a078cd68077eb8b5aa3a217a8fe6a651fa57 Mon Sep 17 00:00:00 2001 From: fionaxu Date: Wed, 11 Apr 2018 12:47:46 -0700 Subject: Change getGroupIdLevel1() to use subId from TelephonyManager Instance Bug: 77905912 Test: Build Change-Id: I720971ce115147b994e27611a0dcf052989180ec (cherry picked from commit 272e8cf87e3aa780d7b83c021b859fdfc396f9d8) Merged-in: 272e8cf87e3aa780d7b83c021b859fdfc396f9d8 --- telephony/java/android/telephony/TelephonyManager.java | 2 +- telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index c2cbd0612b08..49094604a841 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -2925,7 +2925,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) { diff --git a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl index 0ed0820c888f..93964f3d30a6 100644 --- a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl +++ b/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. */ -- cgit v1.2.3-59-g8ed1b