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

Merge "Renamed methods for clatification" am: f8db4fe14c am: e3caa55db1

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2470984

Change-Id: I50685a28afe2d6d295c97ff344d61e68acca07ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-04 19:38:15 +00:00
committed by Automerger Merge Worker
parent d2839e58e4 e3caa55db1
commit e8011bd74c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2141,7 +2141,7 @@ public class SubscriptionManager {
try { try {
ISub iSub = TelephonyManager.getSubscriptionService(); ISub iSub = TelephonyManager.getSubscriptionService();
if (iSub != null) { if (iSub != null) {
subId = iSub.getSubId(slotIndex); subId = iSub.getSubIds(slotIndex);
} }
} catch (RemoteException ex) { } catch (RemoteException ex) {
// ignore it // ignore it

2
telephony/java/com/android/internal/telephony/ISub.aidl Executable file → Normal file
View File

@@ -244,7 +244,7 @@ interface ISub {
int getSlotIndex(int subId); int getSlotIndex(int subId);
int[] getSubId(int slotIndex); int[] getSubIds(int slotIndex);
int getDefaultSubId(); int getDefaultSubId();