Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5d6dd6a authored by Wink Saville's avatar Wink Saville Committed by android-build-merger
Browse files

am 8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use... 

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

* commit 'fc748fe9':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
parents 78670560 fc748fe9

src/com/android/settings/DataUsageSummary.java

+1 −1
Original line number Diff line number Diff line
@@ -2285,7 +2285,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable 
        if (template == null) {

            final int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,

                    SubscriptionManager.INVALID_SUBSCRIPTION_ID);

            if (SubscriptionManager.isValidSubId(subId)) {

            if (SubscriptionManager.isValidSubscriptionId(subId)) {

                return TAB_MOBILE + String.valueOf(subId);

            }

            return null;

src/com/android/settings/deviceinfo/SimStatus.java

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ public class SimStatus extends PreferenceActivity { 
            final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId(

                        mSir.getSubscriptionId()));

            if (UserHandle.myUserId() == UserHandle.USER_OWNER

                    && mSir.getSubscriptionId() != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

                    && SubscriptionManager.isValidSubscriptionId(mSir.getSubscriptionId())) {

                if (phone == null) {

                    Log.e(TAG, "Unable to locate a phone object for the given Subscription ID.");

                    return;