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

Commit c3ad3db8 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Allow renaming inactive subscriptions." into qt-dev am: 70fc386e 

am: c7ba7118

Change-Id: Ibafca9184fed91b1cd7f50afc85c055031fa3756
parents fc8c490f c7ba7118

src/java/com/android/internal/telephony/SubscriptionController.java

+7 −3
Original line number Diff line number Diff line
@@ -1560,10 +1560,14 @@ public class SubscriptionController extends ISub.Stub { 
        final long identity = Binder.clearCallingIdentity();

        try {

            validateSubId(subId);

            for (SubscriptionInfo subInfo : mCacheActiveSubInfoList) {

            List<SubscriptionInfo> allSubInfo = getSubInfo(null, null);

            // if there is no sub in the db, return 0 since subId does not exist in db

            if (allSubInfo == null || allSubInfo.isEmpty()) return 0;

            for (SubscriptionInfo subInfo : allSubInfo) {

                if (subInfo.getSubscriptionId() == subId

                        && getNameSourcePriority(subInfo.getNameSource())

                                > getNameSourcePriority(nameSource)) {

                        && (getNameSourcePriority(subInfo.getNameSource())

                                > getNameSourcePriority(nameSource)

                        || (displayName != null && displayName.equals(subInfo.getDisplayName())))) {

                    return 0;

                }

            }