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

Commit e9361752 authored by Ling Ma's avatar Ling Ma
Browse files

clean up flag 

Test: basic voice call + data browsing
Flag: EXEMPT removing cleanup

Change-Id: I5ac847f15d15186449302a0ec831c47d07cb7aa7
parent 0fb60746

flags/subscription.aconfig

+0 −12
Original line number Diff line number Diff line
@@ -46,18 +46,6 @@ flag { 
  bug: "325045841"

}



# OWNER=nharold TARGET=24Q3

flag {

  name: "safer_get_phone_number"

  namespace: "telephony"

  description: "Safety and performance improvements for getPhoneNumber()"

  bug: "317673478"



  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



# OWNER=songferngwang TARGET=24Q3

flag {

  name: "reset_primary_sim_default_values"

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

+30 −82
Original line number Diff line number Diff line
@@ -3843,7 +3843,6 @@ public class SubscriptionManagerService extends ISub.Stub { 
                Manifest.permission.READ_PRIVILEGED_PHONE_STATE);

        enforceTelephonyFeatureWithException(callingPackage, "getPhoneNumber");



        if (mFeatureFlags.saferGetPhoneNumber()) {

        checkPhoneNumberSource(source);

        subId = checkAndGetSubId(subId);

        if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) return "";
@@ -3854,36 +3853,7 @@ public class SubscriptionManagerService extends ISub.Stub { 
        } finally {

            Binder.restoreCallingIdentity(identity);

        }

        } else {

            final long identity = Binder.clearCallingIdentity();

            try {

                SubscriptionInfoInternal subInfo = mSubscriptionDatabaseManager

                        .getSubscriptionInfoInternal(subId);



                if (subInfo == null) {

                    loge("Invalid sub id " + subId + ", callingPackage=" + callingPackage);

                    return "";

                }



                switch(source) {

                    case SubscriptionManager.PHONE_NUMBER_SOURCE_UICC:

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

                        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:

                        return subInfo.getNumberFromIms();

                    default:

                        throw new IllegalArgumentException("Invalid number source " + source);

                }

            } finally {

                Binder.restoreCallingIdentity(identity);

            }

        }

    }



    /**
@@ -3989,7 +3959,6 @@ public class SubscriptionManagerService extends ISub.Stub { 
        enforceTelephonyFeatureWithException(callingPackage,

                "getPhoneNumberFromFirstAvailableSource");



        if (mFeatureFlags.saferGetPhoneNumber()) {

        subId = checkAndGetSubId(subId);

        if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) return "";
@@ -4013,27 +3982,6 @@ public class SubscriptionManagerService extends ISub.Stub { 
        } finally {

            Binder.restoreCallingIdentity(identity);

        }

        } else {

            String numberFromCarrier = getPhoneNumber(subId,

                    SubscriptionManager.PHONE_NUMBER_SOURCE_CARRIER, callingPackage,

                    callingFeatureId);

            if (!TextUtils.isEmpty(numberFromCarrier)) {

                return numberFromCarrier;

            }

            String numberFromUicc = getPhoneNumber(

                    subId, SubscriptionManager.PHONE_NUMBER_SOURCE_UICC, callingPackage,

                    callingFeatureId);

            if (!TextUtils.isEmpty(numberFromUicc)) {

                return numberFromUicc;

            }

            String numberFromIms = getPhoneNumber(

                    subId, SubscriptionManager.PHONE_NUMBER_SOURCE_IMS, callingPackage,

                    callingFeatureId);

            if (!TextUtils.isEmpty(numberFromIms)) {

                return numberFromIms;

            }

            return "";

        }

    }



    /**

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).saferGetPhoneNumber();

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

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

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