Cleaned up the flag enable_identifier_disclosure_transparency
Cleaned up the 24Q3 flag enable_identifier_disclosure_transparency Bug: 276752426 Test: Basic telephony functionality tests Test: atest FrameworksTelephonyTests Flag: EXEMPT removing flag Change-Id: Id3355ef2416f75df8ca43cc4d261583e92c17fba
This commit is contained in:
@@ -72,7 +72,6 @@ public class CellularSecurityPreferenceController extends BasePreferenceControll
|
|||||||
if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
|
if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
|
||||||
|| !Flags.enableIdentifierDisclosureTransparencyUnsolEvents()
|
|| !Flags.enableIdentifierDisclosureTransparencyUnsolEvents()
|
||||||
|| !Flags.enableModemCipherTransparencyUnsolEvents()
|
|| !Flags.enableModemCipherTransparencyUnsolEvents()
|
||||||
|| !Flags.enableIdentifierDisclosureTransparency()
|
|
||||||
|| !Flags.enableModemCipherTransparency()) {
|
|| !Flags.enableModemCipherTransparency()) {
|
||||||
return UNSUPPORTED_ON_DEVICE;
|
return UNSUPPORTED_ON_DEVICE;
|
||||||
}
|
}
|
||||||
|
@@ -62,7 +62,6 @@ public class CellularSecurityNotificationsDividerController extends
|
|||||||
public int getAvailabilityStatus() {
|
public int getAvailabilityStatus() {
|
||||||
if (!Flags.enableIdentifierDisclosureTransparencyUnsolEvents()
|
if (!Flags.enableIdentifierDisclosureTransparencyUnsolEvents()
|
||||||
|| !Flags.enableModemCipherTransparencyUnsolEvents()
|
|| !Flags.enableModemCipherTransparencyUnsolEvents()
|
||||||
|| !Flags.enableIdentifierDisclosureTransparency()
|
|
||||||
|| !Flags.enableModemCipherTransparency()) {
|
|| !Flags.enableModemCipherTransparency()) {
|
||||||
return UNSUPPORTED_ON_DEVICE;
|
return UNSUPPORTED_ON_DEVICE;
|
||||||
}
|
}
|
||||||
|
@@ -180,7 +180,6 @@ public class CellularSecurityNotificationsPreferenceController extends
|
|||||||
private boolean areFlagsEnabled() {
|
private boolean areFlagsEnabled() {
|
||||||
if (!Flags.enableIdentifierDisclosureTransparencyUnsolEvents()
|
if (!Flags.enableIdentifierDisclosureTransparencyUnsolEvents()
|
||||||
|| !Flags.enableModemCipherTransparencyUnsolEvents()
|
|| !Flags.enableModemCipherTransparencyUnsolEvents()
|
||||||
|| !Flags.enableIdentifierDisclosureTransparency()
|
|
||||||
|| !Flags.enableModemCipherTransparency()) {
|
|| !Flags.enableModemCipherTransparency()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@@ -169,15 +169,11 @@ public final class CellularSecurityPreferenceControllerTest {
|
|||||||
mSetFlagsRule.enableFlags(
|
mSetFlagsRule.enableFlags(
|
||||||
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);
|
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);
|
||||||
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);
|
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);
|
||||||
mSetFlagsRule.enableFlags(
|
|
||||||
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY);
|
|
||||||
} else {
|
} else {
|
||||||
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS);
|
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS);
|
||||||
mSetFlagsRule.disableFlags(
|
mSetFlagsRule.disableFlags(
|
||||||
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);
|
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);
|
||||||
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);
|
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);
|
||||||
mSetFlagsRule.disableFlags(
|
|
||||||
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -129,15 +129,11 @@ public class CellularSecurityNotificationsDividerControllerTest {
|
|||||||
mSetFlagsRule.enableFlags(
|
mSetFlagsRule.enableFlags(
|
||||||
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);
|
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);
|
||||||
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);
|
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);
|
||||||
mSetFlagsRule.enableFlags(
|
|
||||||
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY);
|
|
||||||
} else {
|
} else {
|
||||||
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS);
|
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS);
|
||||||
mSetFlagsRule.disableFlags(
|
mSetFlagsRule.disableFlags(
|
||||||
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);
|
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);
|
||||||
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);
|
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);
|
||||||
mSetFlagsRule.disableFlags(
|
|
||||||
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -233,15 +233,11 @@ public class CellularSecurityNotificationsPreferenceControllerTest {
|
|||||||
mSetFlagsRule.enableFlags(
|
mSetFlagsRule.enableFlags(
|
||||||
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);
|
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);
|
||||||
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);
|
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);
|
||||||
mSetFlagsRule.enableFlags(
|
|
||||||
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY);
|
|
||||||
} else {
|
} else {
|
||||||
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS);
|
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS);
|
||||||
mSetFlagsRule.disableFlags(
|
mSetFlagsRule.disableFlags(
|
||||||
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);
|
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);
|
||||||
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);
|
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);
|
||||||
mSetFlagsRule.disableFlags(
|
|
||||||
Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user