PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleaned up the flag enable_identifier_disclosure_transparency" into main

Browse Source
This commit is contained in:
Jack Yu
2025-01-28 18:09:37 -08:00
committed by Android (Google) Code Review
parent 6e12194015 506c3e04e3
commit 5161aff82e
6 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/network/CellularSecurityPreferenceController.java
View File

@@ -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;
} }

1
src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerController.java
View File

@@ -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;
} }

1
src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceController.java
View File

@@ -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;
} }

4
tests/unit/src/com/android/settings/network/CellularSecurityPreferenceControllerTest.java
View File

@@ -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);
} }
} }
} }

4
tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerControllerTest.java
View File

@@ -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);
} }
} }
} }

4
tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceControllerTest.java
View File

@@ -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);
} }
} }
} }