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

Commit 5d8e5fe5 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge changes from topic... 

Merge changes from topic "revert-17034757-VoWifi_Emergency_Notification-NYDZQSHARD" into tm-mainline-prod

* changes:
  [automerge] Revert "VoWifi notification for emergency calls" 2p: 501b640a
  Revert "VoWifi notification for emergency calls"
parents b5a7c1d7 d79acc64

core/res/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -234,9 +234,9 @@ 
    <!-- Displayed to tell the user that they should switch their network preference. -->

    <string name="NetworkPreferenceSwitchSummary">Try changing preferred network. Tap to change.</string>

    <!-- 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. -->

    <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. -->

    <string name="notification_channel_network_alert">Alerts</string>

telephony/java/com/android/internal/telephony/TelephonyIntents.java

+0 −20
Original line number Diff line number Diff line
@@ -424,24 +424,4 @@ public class TelephonyIntents { 
     */

    @Deprecated

    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";

}