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

Commit 21133d63 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "clean_up_apn_setting_field_support_flag" into main 

* changes:
  Cleaned up the flag apn_setting_field_support_flag
  Cleaned up the flag uicc_phone_number_fix
parents 1cf159b0 b0504af9

flags/data.aconfig

+0 −9
Original line number Diff line number Diff line
@@ -32,15 +32,6 @@ flag { 
  bug: "307378699"

}



# OWNER=nagendranb TARGET=24Q3

flag {

  name: "apn_setting_field_support_flag"

  is_exported: true

  namespace: "telephony"

  description: "Expose apn setting supporting field"

  bug: "307038091"

}



# OWNER=sangyun TARGET=24Q3

flag {

  name: "network_validation"

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(),