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

Commit e4071119 authored by Wink Saville's avatar Wink Saville Committed by Natiq Ahmed
Browse files

Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId 

Rename isValidSubId to isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
parent a74dcfe6

packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -346,7 +346,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { 




    private void handleSubInfoChangeIfNeeded() {

    private void handleSubInfoChangeIfNeeded() {

        int subId = mKgUpdateMonitor.getSimPinLockSubId();

        int subId = mKgUpdateMonitor.getSimPinLockSubId();

        if (SubscriptionManager.isValidSubId(subId) && (subId != mSubId)) {

        if (subId != mSubId && SubscriptionManager.isValidSubscriptionId(subId)) {

            mSubId = subId;

            mSubId = subId;

            handleSubInfoChange();

            handleSubInfoChange();

            mRemainingAttempts = -1;

            mRemainingAttempts = -1;

packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -414,7 +414,7 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { 




    private void handleSubInfoChangeIfNeeded() {

    private void handleSubInfoChangeIfNeeded() {

        int subId = mKgUpdateMonitor.getSimPukLockSubId();

        int subId = mKgUpdateMonitor.getSimPukLockSubId();

        if (subId != mSubId) {

        if (subId != mSubId && SubscriptionManager.isValidSubscriptionId(subId)) {

            mSubId = subId;

            mSubId = subId;

            handleSubInfoChange();

            handleSubInfoChange();

            mRemainingAttempts = -1;

            mRemainingAttempts = -1;

services/core/java/com/android/server/TelephonyRegistry.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -480,7 +480,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                r.callerUid = callerUid;

                r.callerUid = callerUid;

                // Legacy applications pass SubscriptionManager.DEFAULT_SUB_ID,

                // Legacy applications pass SubscriptionManager.DEFAULT_SUB_ID,

                // force all illegal subId to 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;

                    r.subId = SubscriptionManager.DEFAULT_SUBSCRIPTION_ID;

                 } else {//APP specify subID

                 } else {//APP specify subID

                    r.subId = subId;

                    r.subId = subId;

telephony/java/android/telephony/SubscriptionManager.java

+11 −11
Original line number Original line Diff line number Diff line
@@ -422,7 +422,7 @@ public class SubscriptionManager { 
     */

     */

    public SubscriptionInfo getActiveSubscriptionInfo(int subId) {

    public SubscriptionInfo getActiveSubscriptionInfo(int subId) {

        if (VDBG) logd("[getActiveSubscriptionInfo]+ subId=" + subId);

        if (VDBG) logd("[getActiveSubscriptionInfo]+ subId=" + subId);

        if (!isValidSubId(subId)) {

        if (!isValidSubscriptionId(subId)) {

            logd("[getActiveSubscriptionInfo]- invalid subId");

            logd("[getActiveSubscriptionInfo]- invalid subId");

            return null;

            return null;

        }

        }
@@ -657,7 +657,7 @@ public class SubscriptionManager { 
     */

     */

    public int setIconTint(int tint, int subId) {

    public int setIconTint(int tint, int subId) {

        if (VDBG) logd("[setIconTint]+ tint:" + tint + " subId:" + subId);

        if (VDBG) logd("[setIconTint]+ tint:" + tint + " subId:" + subId);

        if (!isValidSubId(subId)) {

        if (!isValidSubscriptionId(subId)) {

            logd("[setIconTint]- fail");

            logd("[setIconTint]- fail");

            return -1;

            return -1;

        }

        }
@@ -702,7 +702,7 @@ public class SubscriptionManager { 
            logd("[setDisplayName]+  displayName:" + displayName + " subId:" + subId

            logd("[setDisplayName]+  displayName:" + displayName + " subId:" + subId

                    + " nameSource:" + nameSource);

                    + " nameSource:" + nameSource);

        }

        }

        if (!isValidSubId(subId)) {

        if (!isValidSubscriptionId(subId)) {

            logd("[setDisplayName]- fail");

            logd("[setDisplayName]- fail");

            return -1;

            return -1;

        }

        }
@@ -730,7 +730,7 @@ public class SubscriptionManager { 
     * @hide

     * @hide

     */

     */

    public int setDisplayNumber(String number, int subId) {

    public int setDisplayNumber(String number, int subId) {

        if (number == null || !isValidSubId(subId)) {

        if (number == null || !isValidSubscriptionId(subId)) {

            logd("[setDisplayNumber]- fail");

            logd("[setDisplayNumber]- fail");

            return -1;

            return -1;

        }

        }
@@ -759,7 +759,7 @@ public class SubscriptionManager { 
     */

     */

    public int setDataRoaming(int roaming, int subId) {

    public int setDataRoaming(int roaming, int subId) {

        if (VDBG) logd("[setDataRoaming]+ roaming:" + roaming + " subId:" + subId);

        if (VDBG) logd("[setDataRoaming]+ roaming:" + roaming + " subId:" + subId);

        if (roaming < 0 || !isValidSubId(subId)) {

        if (roaming < 0 || !isValidSubscriptionId(subId)) {

            logd("[setDataRoaming]- fail");

            logd("[setDataRoaming]- fail");

            return -1;

            return -1;

        }

        }
@@ -785,7 +785,7 @@ public class SubscriptionManager { 
     * @hide

     * @hide

     */

     */

    public static int getSlotId(int subId) {

    public static int getSlotId(int subId) {

        if (!isValidSubId(subId)) {

        if (!isValidSubscriptionId(subId)) {

            logd("[getSlotId]- fail");

            logd("[getSlotId]- fail");

        }

        }
@@ -827,7 +827,7 @@ public class SubscriptionManager { 




    /** @hide */

    /** @hide */

    public static int getPhoneId(int subId) {

    public static int getPhoneId(int subId) {

        if (!isValidSubId(subId)) {

        if (!isValidSubscriptionId(subId)) {

            logd("[getPhoneId]- fail");

            logd("[getPhoneId]- fail");

            return INVALID_PHONE_INDEX;

            return INVALID_PHONE_INDEX;

        }

        }
@@ -1041,13 +1041,13 @@ public class SubscriptionManager { 
    //FIXME this is vulnerable to race conditions

    //FIXME this is vulnerable to race conditions

    /** @hide */

    /** @hide */

    public boolean allDefaultsSelected() {

    public boolean allDefaultsSelected() {

        if (getDefaultDataSubId() == INVALID_SUBSCRIPTION_ID) {

        if (!isValidSubscriptionId(getDefaultDataSubId())) {

            return false;

            return false;

        }

        }

        if (getDefaultSmsSubId() == INVALID_SUBSCRIPTION_ID) {

        if (!isValidSubscriptionId(getDefaultSmsSubId())) {

            return false;

            return false;

        }

        }

        if (getDefaultVoiceSubId() == INVALID_SUBSCRIPTION_ID) {

        if (!isValidSubscriptionId(getDefaultVoiceSubId())) {

            return false;

            return false;

        }

        }

        return true;

        return true;
@@ -1074,7 +1074,7 @@ public class SubscriptionManager { 
     * @return true if a valid subId else false

     * @return true if a valid subId else false

     * @hide

     * @hide

     */

     */

    public static boolean isValidSubId(int subId) {

    public static boolean isValidSubscriptionId(int subId) {

        return subId > INVALID_SUBSCRIPTION_ID ;

        return subId > INVALID_SUBSCRIPTION_ID ;

    }

    }