PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f5d6dd6a: am 8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev automerge: fc748fe

Browse Source 
* commit 'f5d6dd6a11ef0fd7518ba5905571c714e4b2df33':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
This commit is contained in:
Wink Saville
2014-12-12 04:48:31 +00:00
committed by Android Git Automerger
parent 394cc0a898 f5d6dd6a11
commit 47a05fc45b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/DataUsageSummary.java
View File

@@ -2285,7 +2285,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
if (template == null) { if (template == null) {
final int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY, final int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
SubscriptionManager.INVALID_SUBSCRIPTION_ID); SubscriptionManager.INVALID_SUBSCRIPTION_ID);
if (SubscriptionManager.isValidSubId(subId)) { if (SubscriptionManager.isValidSubscriptionId(subId)) {
return TAB_MOBILE + String.valueOf(subId); return TAB_MOBILE + String.valueOf(subId);
} }
return null; return null;

2
src/com/android/settings/deviceinfo/SimStatus.java
View File

@@ -365,7 +365,7 @@ public class SimStatus extends PreferenceActivity {
final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId( final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId(
mSir.getSubscriptionId())); mSir.getSubscriptionId()));
if (UserHandle.myUserId() == UserHandle.USER_OWNER if (UserHandle.myUserId() == UserHandle.USER_OWNER
&& mSir.getSubscriptionId() != SubscriptionManager.INVALID_SUBSCRIPTION_ID) { && SubscriptionManager.isValidSubscriptionId(mSir.getSubscriptionId())) {
if (phone == null) { if (phone == null) {
Log.e(TAG, "Unable to locate a phone object for the given Subscription ID."); Log.e(TAG, "Unable to locate a phone object for the given Subscription ID.");
return; return;