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

Commit bbe27c56 authored by Jack Yu's avatar Jack Yu
Browse files

Cleaned up the flag uicc_phone_number_fix 

Cleaned up the 24Q4 flag uicc_phone_number_fix

Bug: 302437869
Test: atest SubscriptionManagerServiceTest
Test: Basic telephony functionality tests
Flag: EXEMPT flag cleanup
Change-Id: If4d69b352a8f451d76d962b2a107a1e5b22938ef
parent 1891ff6b

flags/subscription.aconfig

+0 −12
Original line number Diff line number Diff line
@@ -58,18 +58,6 @@ flag { 
  }

}



# OWNER=jackyu TARGET=24Q4

flag {

  name: "uicc_phone_number_fix"

  namespace: "telephony"

  description: "Fixed that empty phone number when getLine1Number returns empty"

  bug: "302437869"



  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



# OWNER=jmattis TARGET=25Q2

flag {

  name: "subscription_plan_allow_status_and_end_date"

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+5 −13
Original line number Diff line number Diff line
@@ -3908,7 +3908,6 @@ public class SubscriptionManagerService extends ISub.Stub { 
        switch(source) {

            case SubscriptionManager.PHONE_NUMBER_SOURCE_UICC:

                final Phone phone = PhoneFactory.getPhone(getSlotIndex(subId));

                if (mFeatureFlags.uiccPhoneNumberFix()) {

                if (phone != null) {

                    String number = phone.getLine1Number();

                    if (!TextUtils.isEmpty(number)) {
@@ -3916,13 +3915,6 @@ public class SubscriptionManagerService extends ISub.Stub { 
                    }

                }

                return subInfo.getNumber();

                } else {

                    if (phone != null) {

                        return TextUtils.emptyIfNull(phone.getLine1Number());

                    } else {

                        return subInfo.getNumber();

                    }

                }

            case SubscriptionManager.PHONE_NUMBER_SOURCE_CARRIER:

                return subInfo.getNumberFromCarrier();

            case SubscriptionManager.PHONE_NUMBER_SOURCE_IMS:

tests/telephonytests/src/com/android/internal/telephony/subscription/SubscriptionManagerServiceTest.java

+0 −1
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
        ((MockContentResolver) mContext.getContentResolver()).addProvider(

                Telephony.Carriers.CONTENT_URI.getAuthority(), mSubscriptionProvider);



        doReturn(true).when(mFeatureFlags).uiccPhoneNumberFix();

        doReturn(true).when(mFeatureFlags).ddsCallback();



        mSubscriptionManagerServiceUT = new SubscriptionManagerService(mContext, Looper.myLooper(),