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

Commit 09c663a8 authored by Chen Xu's avatar Chen Xu Committed by Gerrit Code Review
Browse files

Merge "renaming telephony internal hidden intents"

parents ac9b2c4f b80c879c

packages/CarrierDefaultApp/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
    <application android:label="@string/app_name" >

        <receiver android:name="com.android.carrierdefaultapp.CarrierDefaultBroadcastReceiver">

            <intent-filter>

                <action android:name="android.intent.action.CARRIER_SIGNAL_REDIRECTED" />

                <action android:name="com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED" />

            </intent-filter>

        </receiver>

        <activity android:name="com.android.carrierdefaultapp.CaptivePortalLaunchActivity"

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

+3 −3
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ public class TelephonyIntents { 
     * <p class="note">This is a protected intent that can only be sent by the system.</p>

     */

    public static final String ACTION_CARRIER_SIGNAL_REDIRECTED =

            "android.intent.action.CARRIER_SIGNAL_REDIRECTED";

            "com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED";

    /**

     * <p>Broadcast Action: when data connections setup fails.

     * intended for sim/account status checks and only sent to the specified carrier app
@@ -424,7 +424,7 @@ public class TelephonyIntents { 
     * <p class="note">This is a protected intent that can only be sent by the system. </p>

     */

    public static final String ACTION_CARRIER_SIGNAL_REQUEST_NETWORK_FAILED =

            "android.intent.action.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED";

            "com.android.internal.telephony.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED";



    /**

     * <p>Broadcast Action: when pco value is available.
@@ -441,7 +441,7 @@ public class TelephonyIntents { 
     * <p class="note">This is a protected intent that can only be sent by the system. </p>

     */

    public static final String ACTION_CARRIER_SIGNAL_PCO_VALUE =

            "android.intent.action.CARRIER_SIGNAL_PCO_VALUE";

            "com.android.internal.telephony.CARRIER_SIGNAL_PCO_VALUE";



    // CARRIER_SIGNAL_ACTION extra keys

    public static final String EXTRA_REDIRECTION_URL_KEY = "redirectionUrl";