Clean up flag data_only_service_allow_emergency_call_only
The flag has been advanced to next for a long while and no regression is
observed. Clean it up the flag and TODO to keep the code healthy.
Bug: 296097429
Test: atest FrameworksTelephonyTests
Flag: EXEMPT flag clean up
Change-Id: I3cf41f284660ec37d7c638f06c1c8ed55e4ec746
diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 7fd8ae6..c39d121 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -508,14 +508,9 @@
// Set CAPABILITY_EMERGENCY_CALLS_ONLY flag if either
// - Carrier config overrides subscription is not voice capable, or
// - Resource config overrides it be emergency_calls_only
- // TODO(b/316183370:): merge the two cases when clearing up flag
- if (Flags.dataOnlyServiceAllowEmergencyCallOnly()) {
- if (!isSubscriptionVoiceCapableByCarrierConfig()) {
- capabilities |= PhoneAccount.CAPABILITY_EMERGENCY_CALLS_ONLY;
- }
- }
- if (isEmergency && mContext.getResources().getBoolean(
- R.bool.config_emergency_account_emergency_calls_only)) {
+ if (!isSubscriptionVoiceCapableByCarrierConfig()
+ || (isEmergency && mContext.getResources().getBoolean(
+ R.bool.config_emergency_account_emergency_calls_only))) {
capabilities |= PhoneAccount.CAPABILITY_EMERGENCY_CALLS_ONLY;
}