Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "VoWifi notification for emergency calls"" into tm-dev

Browse Source
This commit is contained in:
Aishwarya Mallampati
2022-04-08 00:46:32 +00:00
committed by Android (Google) Code Review
parent 27561c31f0 501b640ae0
commit 2e894a2754
2 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/strings.xml
View File

@@ -234,9 +234,9 @@
<!-- Displayed to tell the user that they should switch their network preference. --> <!-- Displayed to tell the user that they should switch their network preference. -->
<string name="NetworkPreferenceSwitchSummary">Try changing preferred network. Tap to change.</string> <string name="NetworkPreferenceSwitchSummary">Try changing preferred network. Tap to change.</string>
<!-- Displayed to tell the user that emergency calls might not be available. --> <!-- Displayed to tell the user that emergency calls might not be available. -->
<string name="EmergencyCallWarningTitle">Emergency calls may be unavailable</string> <string name="EmergencyCallWarningTitle">Emergency calling unavailable</string>
<!-- Displayed to tell the user that emergency calls might not be available. --> <!-- Displayed to tell the user that emergency calls might not be available. -->
<string name="EmergencyCallWarningSummary"><xliff:g id="spn" example="Operator">%s</xliff:g> doesn\'t support emergency calls over Wi-Fi. Tap for details.</string> <string name="EmergencyCallWarningSummary">Can\u2019t make emergency calls over Wi\u2011Fi</string>
<!-- Telephony notification channel name for a channel containing network alert notifications. --> <!-- Telephony notification channel name for a channel containing network alert notifications. -->
<string name="notification_channel_network_alert">Alerts</string> <string name="notification_channel_network_alert">Alerts</string>

20
telephony/java/com/android/internal/telephony/TelephonyIntents.java
View File

@@ -424,24 +424,4 @@ public class TelephonyIntents {
*/ */
@Deprecated @Deprecated
public static final String EXTRA_DEFAULT_NETWORK_AVAILABLE = "defaultNetworkAvailable"; public static final String EXTRA_DEFAULT_NETWORK_AVAILABLE = "defaultNetworkAvailable";
/**
* <p>Broadcast sent to show Emergency notification due to Voice Over Wifi availability
*
* <p class="note">
* You can <em>not</em> receive this through components declared
* in manifests, only by explicitly registering for it with
* {@link android.content.Context#registerReceiver(android.content.BroadcastReceiver,
* android.content.IntentFilter) Context.registerReceiver()}.
*
* <p class="note">
* Requires no permission.
*
* <p class="note">This is a protected intent that can only be sent
* by the system.
*
* @hide
*/
public static final String ACTION_VOWIFI_ENABLED
= "com.android.internal.telephony.ACTION_VOWIFI_ENABLED";
} }