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

Commit 3c397a62 authored by Chen Xu's avatar Chen Xu Committed by Gerrit Code Review
Browse files

Merge "SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent"

parents cd953e93 39b95941

api/removed.txt

+0 −4
Original line number Diff line number Diff line
@@ -595,10 +595,6 @@ package android.provider { 
    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 {

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -6145,6 +6145,10 @@ package android.provider { 
    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 {















    field public static final String AUTHORITY = "com.android.timezone";















  }

































telephony/java/android/provider/Telephony.java



+7
−5




























Original line number
Diff line number
Diff line








@@ -1127,8 +1127,9 @@ public final class Telephony {













             * values:</p>















             *















             * <ul>













             *   <li><em>"message"</em> - An SmsCbMessage object containing the broadcast message













             *   data, including ETWS or CMAS warning notification info if present.</li>













             *   <li><em>"message"</em> - An {@link android.telephony.SmsCbMessage} object













             *   containing the broadcast message data, including ETWS or CMAS warning notification













             *   info if present.</li>















             * </ul>















             *















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















             * receive.</p>













             * @removed













             * @hide















             */















            @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)













            public static final String SMS_EMERGENCY_CB_RECEIVED_ACTION =













                    "android.provider.Telephony.SMS_EMERGENCY_CB_RECEIVED";













            @SystemApi













            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

































telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -33,7 +33,7 @@ import java.util.Locale;













 * All relevant header information is now sent as a Parcelable















 * {@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_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.















 */















public class SmsCbHeader {