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"

Browse Source
This commit is contained in:
Chen Xu
2018-04-12 04:30:18 +00:00
committed by Gerrit Code Review
parent f0e598b550 4801a078cd
commit 18fe1cb2e1
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

@@ -2925,7 +2925,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) {

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

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