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

Merge "SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent"

Browse Source 
am: 3c397a6217

Change-Id: I87928d3760e884b7b0348f7bbedfdde4c5e8d623
This commit is contained in:
Chen Xu
2019-11-18 11:16:54 -08:00
committed by android-build-merger
parent 2d98a66b18 3c397a6217
commit 42d7faea52
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/removed.txt
View File

@@ -595,10 +595,6 @@ package android.provider {
field public static final String VOLUME_VOICE = "volume_voice"; field public static final String VOLUME_VOICE = "volume_voice";
} }
public static final class Telephony.Sms.Intents {
field public static final String SMS_EMERGENCY_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_EMERGENCY_CB_RECEIVED";
}
} }
package android.speech.tts { package android.speech.tts {

4
api/system-current.txt
View File

@@ -6145,6 +6145,10 @@ package android.provider {
field public static final String SLOT_INDEX = "slot_index"; field public static final String SLOT_INDEX = "slot_index";
} }
public static final class Telephony.Sms.Intents {
field public static final String ACTION_SMS_EMERGENCY_CB_RECEIVED = "android.provider.action.SMS_EMERGENCY_CB_RECEIVED";
}
public final class TimeZoneRulesDataContract { public final class TimeZoneRulesDataContract {
field public static final String AUTHORITY = "com.android.timezone"; field public static final String AUTHORITY = "com.android.timezone";
} }

12
telephony/java/android/provider/Telephony.java
View File

@@ -1127,8 +1127,9 @@ public final class Telephony {
* values:</p> * values:</p>
* *
* <ul> * <ul>
* <li><em>"message"</em> - An SmsCbMessage object containing the broadcast message * <li><em>"message"</em> - An {@link android.telephony.SmsCbMessage} object
* data, including ETWS or CMAS warning notification info if present.</li> * containing the broadcast message data, including ETWS or CMAS warning notification
* info if present.</li>
* </ul> * </ul>
* *
* <p>The extra values can be extracted using * <p>The extra values can be extracted using
@@ -1139,11 +1140,12 @@ public final class Telephony {
* *
* <p>Requires {@link android.Manifest.permission#RECEIVE_EMERGENCY_BROADCAST} to * <p>Requires {@link android.Manifest.permission#RECEIVE_EMERGENCY_BROADCAST} to
* receive.</p> * receive.</p>
* @removed * @hide
*/ */
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String SMS_EMERGENCY_CB_RECEIVED_ACTION = @SystemApi
"android.provider.Telephony.SMS_EMERGENCY_CB_RECEIVED"; public static final String ACTION_SMS_EMERGENCY_CB_RECEIVED =
"android.provider.action.SMS_EMERGENCY_CB_RECEIVED";
/** /**
* Broadcast Action: A new CDMA SMS has been received containing Service Category * Broadcast Action: A new CDMA SMS has been received containing Service Category

2
telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java
View File

@@ -33,7 +33,7 @@ import java.util.Locale;
* All relevant header information is now sent as a Parcelable * All relevant header information is now sent as a Parcelable
* {@link android.telephony.SmsCbMessage} object in the "message" extra of the * {@link android.telephony.SmsCbMessage} object in the "message" extra of the
* {@link android.provider.Telephony.Sms.Intents#SMS_CB_RECEIVED_ACTION} or * {@link android.provider.Telephony.Sms.Intents#SMS_CB_RECEIVED_ACTION} or
* {@link android.provider.Telephony.Sms.Intents#SMS_EMERGENCY_CB_RECEIVED_ACTION} intent. * {@link android.provider.Telephony.Sms.Intents#ACTION_SMS_EMERGENCY_CB_RECEIVED} intent.
* The raw PDU is no longer sent to SMS CB applications. * The raw PDU is no longer sent to SMS CB applications.
*/ */
public class SmsCbHeader { public class SmsCbHeader {