Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 1be0392273

Change-Id: I89b46de2f70ca8a33eb57bc3ddf7c4a8c41d1034
This commit is contained in:
Chen Xu
2018-04-11 18:30:01 -07:00
committed by android-build-merger
parent 2fca3a0cc7 1be0392273
commit 5327a38956
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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) {

5
telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl
View File

@@ -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.
*/