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

Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev

Browse Source
This commit is contained in:
Wink Saville
2014-12-12 04:22:38 +00:00
committed by Android (Google) Code Review
parent 45838de942 a54bf65833
commit 6e04a7b654
8 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java
View File

@@ -81,11 +81,11 @@ public class KeyguardSecurityModel {
SecurityMode getSecurityMode() {
KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);
SecurityMode mode = SecurityMode.None;
if (monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED)
!= SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
if (SubscriptionManager.isValidSubscriptionId(
monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED))) {
mode = SecurityMode.SimPin;
} else if (monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED)
!= SubscriptionManager.INVALID_SUBSCRIPTION_ID
} else if (SubscriptionManager.isValidSubscriptionId(
monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED))
&& mLockPatternUtils.isPukUnlockScreenEnable()) {
mode = SecurityMode.SimPuk;
} else {

2
packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
View File

@@ -75,7 +75,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
if (DEBUG) Log.v(TAG, "Resetting state");
KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);
mSubId = monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED);
if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
if (SubscriptionManager.isValidSubscriptionId(mSubId)) {
int count = TelephonyManager.getDefault().getSimCount();
Resources rez = getResources();
final String msg;

2
packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java
View File

@@ -118,7 +118,7 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView {
state = ENTER_PUK;
KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);
mSubId = monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED);
if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
if (SubscriptionManager.isValidSubscriptionId(mSubId)) {
int count = TelephonyManager.getDefault().getSimCount();
Resources rez = getResources();
final String msg;

2
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -938,7 +938,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
+ slotId + ", state=" + state +")");
}
if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
if (!SubscriptionManager.isValidSubscriptionId(subId)) {
Log.w(TAG, "invalid subId in handleSimStateChange()");
return;
}

9
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -964,11 +964,10 @@ public class KeyguardViewMediator extends SystemUI {
// if the setup wizard hasn't run yet, don't show
final boolean requireSim = !SystemProperties.getBoolean("keyguard.no_require_sim", false);
final boolean absent = mUpdateMonitor.getNextSubIdForState(
IccCardConstants.State.ABSENT) != SubscriptionManager.INVALID_SUBSCRIPTION_ID;
final boolean disabled = mUpdateMonitor.getNextSubIdForState(
IccCardConstants.State.PERM_DISABLED)
!= SubscriptionManager.INVALID_SUBSCRIPTION_ID;
final boolean absent = SubscriptionManager.isValidSubscriptionId(
mUpdateMonitor.getNextSubIdForState(IccCardConstants.State.ABSENT));
final boolean disabled = SubscriptionManager.isValidSubscriptionId(
mUpdateMonitor.getNextSubIdForState(IccCardConstants.State.PERM_DISABLED));
final boolean lockedOrMissing = mUpdateMonitor.isSimPinSecure()
|| ((absent || disabled) && requireSim);

11
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
View File

@@ -265,7 +265,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
private MobileSignalController getDataController() {
int dataSubId = SubscriptionManager.getDefaultDataSubId();
if (dataSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
if (!SubscriptionManager.isValidSubscriptionId(dataSubId)) {
if (DEBUG) Log.e(TAG, "No data sim selected");
return mDefaultSignalController;
}
@@ -283,8 +283,9 @@ public class NetworkControllerImpl extends BroadcastReceiver
public boolean isEmergencyOnly() {
int voiceSubId = SubscriptionManager.getDefaultVoiceSubId();
if (voiceSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
for (MobileSignalController mobileSignalController : mMobileSignalControllers.values()) {
if (!SubscriptionManager.isValidSubscriptionId(voiceSubId)) {
for (MobileSignalController mobileSignalController :
mMobileSignalControllers.values()) {
if (!mobileSignalController.isEmergencyOnly()) {
return false;
}
@@ -397,7 +398,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
} else {
int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
if (SubscriptionManager.isValidSubscriptionId(subId)) {
if (mMobileSignalControllers.containsKey(subId)) {
mMobileSignalControllers.get(subId).handleBroadcast(intent);
} else {
@@ -1265,7 +1266,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
private void updateDataSim() {
int defaultDataSub = SubscriptionManager.getDefaultDataSubId();
if (SubscriptionManager.isValidSubId(defaultDataSub)) {
if (SubscriptionManager.isValidSubscriptionId(defaultDataSub)) {
mCurrentState.dataSim = defaultDataSub == mSubscriptionInfo.getSubscriptionId();
} else {
// There doesn't seem to be a data sim selected, however if

2
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -480,7 +480,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
r.callerUid = callerUid;
// Legacy applications pass SubscriptionManager.DEFAULT_SUB_ID,
// force all illegal subId to SubscriptionManager.DEFAULT_SUB_ID
if (!SubscriptionManager.isValidSubId(subId)) {
if (!SubscriptionManager.isValidSubscriptionId(subId)) {
r.subId = SubscriptionManager.DEFAULT_SUBSCRIPTION_ID;
} else {//APP specify subID
r.subId = subId;

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

@@ -392,7 +392,7 @@ public class SubscriptionManager {
*/
public SubscriptionInfo getActiveSubscriptionInfo(int subId) {
if (VDBG) logd("[getActiveSubscriptionInfo]+ subId=" + subId);
if (!isValidSubId(subId)) {
if (!isValidSubscriptionId(subId)) {
logd("[getActiveSubscriptionInfo]- invalid subId");
return null;
}
@@ -626,7 +626,7 @@ public class SubscriptionManager {
*/
public int setIconTint(int tint, int subId) {
if (VDBG) logd("[setIconTint]+ tint:" + tint + " subId:" + subId);
if (!isValidSubId(subId)) {
if (!isValidSubscriptionId(subId)) {
logd("[setIconTint]- fail");
return -1;
}
@@ -671,7 +671,7 @@ public class SubscriptionManager {
logd("[setDisplayName]+ displayName:" + displayName + " subId:" + subId
+ " nameSource:" + nameSource);
}
if (!isValidSubId(subId)) {
if (!isValidSubscriptionId(subId)) {
logd("[setDisplayName]- fail");
return -1;
}
@@ -699,7 +699,7 @@ public class SubscriptionManager {
* @hide
*/
public int setDisplayNumber(String number, int subId) {
if (number == null || !isValidSubId(subId)) {
if (number == null || !isValidSubscriptionId(subId)) {
logd("[setDisplayNumber]- fail");
return -1;
}
@@ -728,7 +728,7 @@ public class SubscriptionManager {
*/
public int setDataRoaming(int roaming, int subId) {
if (VDBG) logd("[setDataRoaming]+ roaming:" + roaming + " subId:" + subId);
if (roaming < 0 || !isValidSubId(subId)) {
if (roaming < 0 || !isValidSubscriptionId(subId)) {
logd("[setDataRoaming]- fail");
return -1;
}
@@ -754,7 +754,7 @@ public class SubscriptionManager {
* @hide
*/
public static int getSlotId(int subId) {
if (!isValidSubId(subId)) {
if (!isValidSubscriptionId(subId)) {
logd("[getSlotId]- fail");
}
@@ -796,7 +796,7 @@ public class SubscriptionManager {
/** @hide */
public static int getPhoneId(int subId) {
if (!isValidSubId(subId)) {
if (!isValidSubscriptionId(subId)) {
logd("[getPhoneId]- fail");
return INVALID_PHONE_INDEX;
}
@@ -985,13 +985,13 @@ public class SubscriptionManager {
//FIXME this is vulnerable to race conditions
/** @hide */
public boolean allDefaultsSelected() {
if (getDefaultDataSubId() == INVALID_SUBSCRIPTION_ID) {
if (!isValidSubscriptionId(getDefaultDataSubId())) {
return false;
}
if (getDefaultSmsSubId() == INVALID_SUBSCRIPTION_ID) {
if (!isValidSubscriptionId(getDefaultSmsSubId())) {
return false;
}
if (getDefaultVoiceSubId() == INVALID_SUBSCRIPTION_ID) {
if (!isValidSubscriptionId(getDefaultVoiceSubId())) {
return false;
}
return true;
@@ -1018,7 +1018,7 @@ public class SubscriptionManager {
* @return true if a valid subId else false
* @hide
*/
public static boolean isValidSubId(int subId) {
public static boolean isValidSubscriptionId(int subId) {
return subId > INVALID_SUBSCRIPTION_ID ;
}