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

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

Merge "Cleaned up the flag enable_identifier_disclosure_transparency" into main

parents 503f3ac8 41a6413c

flags/network.aconfig

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

container: "system"



# OWNER=cukie TARGET=24Q3

flag {

  name: "enable_identifier_disclosure_transparency"

  is_exported: true

  namespace: "telephony"

  description: "Guards APIs for enabling and disabling identifier disclosure transparency"

  bug: "276752426"

}



# OWNER=cukie TARGET=24Q3

flag {

  name: "enable_identifier_disclosure_transparency_unsol_events"

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

+0 −5
Original line number Diff line number Diff line
@@ -5430,11 +5430,6 @@ public class GsmCdmaPhone extends Phone { 


    @Override

    public void handleIdentifierDisclosureNotificationPreferenceChange() {

        if (!mFeatureFlags.enableIdentifierDisclosureTransparency()) {

            logi("Not handling identifier disclosure preference change. Feature flag "

                    + "enable_identifier_disclosure_transparency disabled");

            return;

        }

        boolean prefEnabled = getIdentifierDisclosureNotificationsPreferenceEnabled();



        // The notifier is tied to handling unsolicited updates from the modem, not the

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

+0 −15
Original line number Diff line number Diff line
@@ -3001,22 +3001,8 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
                .addDisclosure(eq(mContext), eq(subId), any(CellularIdentifierDisclosure.class));

    }



    @Test

    public void testCellularIdentifierDisclosure_noModemCallOnRadioAvailable_FlagOff() {

        when(mFeatureFlags.enableIdentifierDisclosureTransparency()).thenReturn(false);

        GsmCdmaPhone phoneUT = makeNewPhoneUT();

        assertFalse(phoneUT.isIdentifierDisclosureTransparencySupported());



        sendRadioAvailableToPhone(phoneUT);



        verify(mMockCi, never()).setCellularIdentifierTransparencyEnabled(anyBoolean(),

                any(Message.class));

        assertFalse(phoneUT.isIdentifierDisclosureTransparencySupported());

    }



    @Test

    public void testCellularIdentifierDisclosure_unsupportedByModemOnRadioAvailable() {

        when(mFeatureFlags.enableIdentifierDisclosureTransparency()).thenReturn(true);

        GsmCdmaPhone phoneUT = makeNewPhoneUT();

        assertFalse(phoneUT.isIdentifierDisclosureTransparencySupported());
@@ -3033,7 +3019,6 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 


    @Test

    public void testCellularIdentifierDisclosure_supportedByModem() {

        when(mFeatureFlags.enableIdentifierDisclosureTransparency()).thenReturn(true);

        GsmCdmaPhone phoneUT = makeNewPhoneUT();

        assertFalse(phoneUT.isIdentifierDisclosureTransparencySupported());