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

am 3c95cae1: Merge "Rename getActivatedXxx to getActiveXxx" into lmp-dev

Browse Source 
* commit '3c95cae1ab33a0fd3bd93422e91a8182bf49d017':
  Rename getActivatedXxx to getActiveXxx
This commit is contained in:
Wink Saville
2014-09-03 23:22:36 +00:00
committed by Android Git Automerger
parent f77a0e7c9a baaa4ef6f0
commit aea3bf798a
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -315,16 +315,16 @@ public class SubscriptionManager implements BaseColumns {
}
/**
* Get the count of activated SUB(s)
* @return activated SIM count
* Get the count of active SUB(s)
* @return active SIM count
*/
public static int getActivatedSubInfoCount() {
public static int getActiveSubInfoCount() {
int result = 0;
try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
result = iSub.getActivatedSubInfoCount();
result = iSub.getActiveSubInfoCount();
}
} catch (RemoteException ex) {
// ignore it
@@ -813,16 +813,16 @@ public class SubscriptionManager implements BaseColumns {
}
/**
* @return the list of subId's that are activated,
* @return the list of subId's that are active,
* is never null but the length maybe 0.
*/
public static long[] getActivatedSubIdList() {
public static long[] getActiveSubIdList() {
long[] subId = null;
try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
subId = iSub.getActivatedSubIdList();
subId = iSub.getActiveSubIdList();
}
} catch (RemoteException ex) {
// ignore it

8
telephony/java/com/android/internal/telephony/ISub.aidl
View File

@@ -66,11 +66,11 @@ interface ISub {
int getAllSubInfoCount();
/**
* Get the count of activated SUB(s)
* Get the count of active SUB(s)
* @param context Context provided by caller
* @return activated SIM count
* @return active SIM count
*/
int getActivatedSubInfoCount();
int getActiveSubInfoCount();
/**
* Add a new SubInfoRecord to subinfo database if needed
@@ -164,5 +164,5 @@ interface ISub {
void clearDefaultsForInactiveSubIds();
long[] getActivatedSubIdList();
long[] getActiveSubIdList();
}