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

Commit ea2710d2 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED,... 

Merge "Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX from Intent class to SubscriptionManager class." into oc-dev am: 080e1657
am: f89879a1

Change-Id: Iac4f73f0c20ce3b95d406d487a5ed2f8ed391033
parents e4c86e4c f89879a1

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -9355,8 +9355,6 @@ package android.content { 
    field public static final java.lang.String ACTION_CREATE_SHORTCUT = "android.intent.action.CREATE_SHORTCUT";

    field public static final java.lang.String ACTION_DATE_CHANGED = "android.intent.action.DATE_CHANGED";

    field public static final java.lang.String ACTION_DEFAULT = "android.intent.action.VIEW";

    field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED";

    field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED";

    field public static final java.lang.String ACTION_DELETE = "android.intent.action.DELETE";

    field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_LOW = "android.intent.action.DEVICE_STORAGE_LOW";

    field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_OK = "android.intent.action.DEVICE_STORAGE_OK";
@@ -9560,7 +9558,6 @@ package android.content { 
    field public static final java.lang.String EXTRA_SHUTDOWN_USERSPACE_ONLY = "android.intent.extra.SHUTDOWN_USERSPACE_ONLY";

    field public static final java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";

    field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT";

    field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.intent.extra.SUBSCRIPTION_INDEX";

    field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE";

    field public static final java.lang.String EXTRA_TEXT = "android.intent.extra.TEXT";

    field public static final java.lang.String EXTRA_TITLE = "android.intent.extra.TITLE";
@@ -40097,8 +40094,11 @@ package android.telephony { 
    method public static int getDefaultVoiceSubscriptionId();

    method public boolean isNetworkRoaming(int);

    method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);

    field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED";

    field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED";

    field public static final int DATA_ROAMING_DISABLE = 0; // 0x0

    field public static final int DATA_ROAMING_ENABLE = 1; // 0x1

    field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX";

    field public static final int INVALID_SUBSCRIPTION_ID = -1; // 0xffffffff

  }

























api/system-current.txt



+3
−3




























Original line number
Diff line number
Diff line








@@ -9882,8 +9882,6 @@ package android.content {













    field public static final java.lang.String ACTION_CREATE_SHORTCUT = "android.intent.action.CREATE_SHORTCUT";















    field public static final java.lang.String ACTION_DATE_CHANGED = "android.intent.action.DATE_CHANGED";















    field public static final java.lang.String ACTION_DEFAULT = "android.intent.action.VIEW";













    field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED";













    field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED";















    field public static final java.lang.String ACTION_DELETE = "android.intent.action.DELETE";















    field public static final deprecated java.lang.String ACTION_DEVICE_INITIALIZATION_WIZARD = "android.intent.action.DEVICE_INITIALIZATION_WIZARD";















    field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_LOW = "android.intent.action.DEVICE_STORAGE_LOW";










@@ -10136,7 +10134,6 @@ package android.content {













    field public static final java.lang.String EXTRA_SPLIT_NAME = "android.intent.extra.SPLIT_NAME";















    field public static final java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";















    field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT";













    field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.intent.extra.SUBSCRIPTION_INDEX";















    field public static final deprecated java.lang.String EXTRA_SYSTEM_ID = "systemId";















    field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE";















    field public static final java.lang.String EXTRA_TEXT = "android.intent.extra.TEXT";










@@ -43585,8 +43582,11 @@ package android.telephony {













    method public static int getDefaultVoiceSubscriptionId();















    method public boolean isNetworkRoaming(int);















    method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);













    field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED";













    field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED";















    field public static final int DATA_ROAMING_DISABLE = 0; // 0x0















    field public static final int DATA_ROAMING_ENABLE = 1; // 0x1













    field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX";















    field public static final int INVALID_SUBSCRIPTION_ID = -1; // 0xffffffff















  }







































api/test-current.txt



+3
−3




























Original line number
Diff line number
Diff line








@@ -9389,8 +9389,6 @@ package android.content {













    field public static final java.lang.String ACTION_CREATE_SHORTCUT = "android.intent.action.CREATE_SHORTCUT";















    field public static final java.lang.String ACTION_DATE_CHANGED = "android.intent.action.DATE_CHANGED";















    field public static final java.lang.String ACTION_DEFAULT = "android.intent.action.VIEW";













    field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED";













    field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED";















    field public static final java.lang.String ACTION_DELETE = "android.intent.action.DELETE";















    field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_LOW = "android.intent.action.DEVICE_STORAGE_LOW";















    field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_OK = "android.intent.action.DEVICE_STORAGE_OK";










@@ -9594,7 +9592,6 @@ package android.content {













    field public static final java.lang.String EXTRA_SHUTDOWN_USERSPACE_ONLY = "android.intent.extra.SHUTDOWN_USERSPACE_ONLY";















    field public static final java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";















    field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT";













    field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.intent.extra.SUBSCRIPTION_INDEX";















    field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE";















    field public static final java.lang.String EXTRA_TEXT = "android.intent.extra.TEXT";















    field public static final java.lang.String EXTRA_TITLE = "android.intent.extra.TITLE";










@@ -40308,8 +40305,11 @@ package android.telephony {













    method public static int getDefaultVoiceSubscriptionId();















    method public boolean isNetworkRoaming(int);















    method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);













    field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED";













    field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED";















    field public static final int DATA_ROAMING_DISABLE = 0; // 0x0















    field public static final int DATA_ROAMING_ENABLE = 1; // 0x1













    field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX";















    field public static final int INVALID_SUBSCRIPTION_ID = -1; // 0xffffffff















  }







































core/java/android/content/Intent.java



+0
−26




























Original line number
Diff line number
Diff line








@@ -3397,32 +3397,6 @@ public class Intent implements Parcelable, Cloneable {













    public static final String















            ACTION_DYNAMIC_SENSOR_CHANGED = "android.intent.action.DYNAMIC_SENSOR_CHANGED";





























    /**













     * Broadcast Action: The default subscription has changed.  This has the following













     * extra values:</p>













     * The {@link #EXTRA_SUBSCRIPTION_INDEX} extra indicates the current default subscription index













     */













    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)













    public static final String ACTION_DEFAULT_SUBSCRIPTION_CHANGED













            = "android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED";



























    /**













     * Broadcast Action: The default sms subscription has changed.  This has the following













     * extra values:</p>













     * {@link #EXTRA_SUBSCRIPTION_INDEX} extra indicates the current default sms













     * subscription index













     */













    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)













    public static final String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED













            = "android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED";



























    /**













     * Integer extra used with {@link #ACTION_DEFAULT_SUBSCRIPTION_CHANGED} and













     * {@link #ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED} to indicate the subscription













     * which has changed.













     */













    public static final String EXTRA_SUBSCRIPTION_INDEX = "android.intent.extra.SUBSCRIPTION_INDEX";





























    /**















     * Deprecated - use ACTION_FACTORY_RESET instead.















     * @hide

































core/res/AndroidManifest.xml



+2
−2




























Original line number
Diff line number
Diff line








@@ -377,8 +377,6 @@













    <protected-broadcast android:name="android.nfc.handover.intent.action.TRANSFER_PROGRESS" />















    <protected-broadcast android:name="android.nfc.handover.intent.action.TRANSFER_DONE" />





























    <protected-broadcast android:name="android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED" />













    <protected-broadcast android:name="android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED" />















    <protected-broadcast android:name="android.intent.action.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED" />















    <protected-broadcast android:name="android.intent.action.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED" />















    <protected-broadcast android:name="android.intent.action.ACTION_SUBINFO_CONTENT_CHANGE" />










@@ -446,6 +444,8 @@













    <protected-broadcast android:name="android.telecom.action.PHONE_ACCOUNT_UNREGISTERED" />















    <protected-broadcast android:name="android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION" />















    <protected-broadcast android:name="android.telephony.action.CARRIER_CONFIG_CHANGED" />













    <protected-broadcast android:name="android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED" />













    <protected-broadcast android:name="android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED" />















    <protected-broadcast android:name="android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION" />































    <protected-broadcast android:name="com.android.bluetooth.btservice.action.ALARM_WAKEUP" />