Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev

am: cdec393aa3

Change-Id: I2e175c9a475d2cc2ad225154dbc5c2f855173975
This commit is contained in:
Chen Xu
2017-06-09 21:00:26 +00:00
committed by android-build-merger

View File

@@ -208,6 +208,9 @@ public class TelephonyIntents {
* <dt>{@code PUK}</dt><dd>locked on PUK1</dd> * <dt>{@code PUK}</dt><dd>locked on PUK1</dd>
* <dt>{@code NETWORK}</dt><dd>locked on network personalization</dd> * <dt>{@code NETWORK}</dt><dd>locked on network personalization</dd>
* </dl> * </dl>
* <dt>rebroadcastOnUnlock</dt>
* <dd>A boolean indicates a rebroadcast on unlock. optional extra, defaults to {@code false}
* if not specified </dd>
* </dl> * </dl>
* *
* <p class="note"> * <p class="note">
@@ -219,6 +222,8 @@ public class TelephonyIntents {
public static final String ACTION_SIM_STATE_CHANGED public static final String ACTION_SIM_STATE_CHANGED
= Intent.ACTION_SIM_STATE_CHANGED; = Intent.ACTION_SIM_STATE_CHANGED;
public static final String EXTRA_REBROADCAST_ON_UNLOCK= "rebroadcastOnUnlock";
/** /**
* Broadcast Action: The time was set by the carrier (typically by the NITZ string). * Broadcast Action: The time was set by the carrier (typically by the NITZ string).
* This is a sticky broadcast. * This is a sticky broadcast.