drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "renaming telephony internal hidden intents"

Browse Source
This commit is contained in:
Chen Xu
2017-02-23 01:55:24 +00:00
committed by Gerrit Code Review
parent ac9b2c4fab b80c879c91
commit 09c663a84c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/CarrierDefaultApp/AndroidManifest.xml
View File

@ -31,7 +31,7 @@
<application android:label="@string/app_name" > <application android:label="@string/app_name" >
<receiver android:name="com.android.carrierdefaultapp.CarrierDefaultBroadcastReceiver"> <receiver android:name="com.android.carrierdefaultapp.CarrierDefaultBroadcastReceiver">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.CARRIER_SIGNAL_REDIRECTED" /> <action android:name="com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<activity android:name="com.android.carrierdefaultapp.CaptivePortalLaunchActivity" <activity android:name="com.android.carrierdefaultapp.CaptivePortalLaunchActivity"

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

@ -411,7 +411,7 @@ public class TelephonyIntents {
* <p class="note">This is a protected intent that can only be sent by the system.</p> * <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 = 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. * <p>Broadcast Action: when data connections setup fails.
* intended for sim/account status checks and only sent to the specified carrier app * 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> * <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 = 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. * <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> * <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 = 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 // CARRIER_SIGNAL_ACTION extra keys
public static final String EXTRA_REDIRECTION_URL_KEY = "redirectionUrl"; public static final String EXTRA_REDIRECTION_URL_KEY = "redirectionUrl";