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

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

Merge "Cleaned up the flag hide_roaming_icon" into main

parents fa451acc a8d039be

flags/network.aconfig

+0 −9
Original line number Diff line number Diff line 
package: "com.android.internal.telephony.flags"

container: "system"



# OWNER=sarahchin TARGET=24Q1

flag {

  name: "hide_roaming_icon"

  is_exported: true

  namespace: "telephony"

  description: "Allow carriers to hide the roaming (R) icon when roaming."

  bug: "301467052"

}



# OWNER=cukie TARGET=24Q3

flag {

  name: "enable_identifier_disclosure_transparency"

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

+1 −2
Original line number Diff line number Diff line
@@ -166,8 +166,7 @@ public class DisplayInfoController extends Handler { 
     */

    private boolean isRoaming() {

        boolean roaming = mServiceState.getRoaming();

        if (roaming && mFeatureFlags.hideRoamingIcon()

                && !mConfigs.getBoolean(CarrierConfigManager.KEY_SHOW_ROAMING_INDICATOR_BOOL)) {

        if (roaming && !mConfigs.getBoolean(CarrierConfigManager.KEY_SHOW_ROAMING_INDICATOR_BOOL)) {

            logl("Override roaming for display due to carrier configs.");

            roaming = false;

        }

tests/telephonytests/src/com/android/internal/telephony/DisplayInfoControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ public class DisplayInfoControllerTest extends TelephonyTest { 
        mFeatureFlags = Mockito.mock(FeatureFlags.class);

        doReturn((Executor) Runnable::run).when(mContext).getMainExecutor();

        mBundle = mContextFixture.getCarrierConfigBundle();

        mBundle.putBoolean(CarrierConfigManager.KEY_SHOW_ROAMING_INDICATOR_BOOL, true);

        mSstHandler = new ServiceStateTrackerTestHandler(getClass().getSimpleName());

        mSstHandler.start();

        waitUntilReady();
@@ -293,7 +294,6 @@ public class DisplayInfoControllerTest extends TelephonyTest { 
        mBundle.putStringArray(

                CarrierConfigManager.KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY, new String[] {NUMERIC});

        mBundle.putBoolean(CarrierConfigManager.KEY_SHOW_ROAMING_INDICATOR_BOOL, false);

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

        sendCarrierConfigUpdate();



        changeRegState(NetworkRegistrationInfo.REGISTRATION_STATE_HOME);