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

Merge changes from topics "128455935", "123661746" am: dc4cb81c83

Browse Source 
am: 1c906d426d

Change-Id: I745f66fc63d03e2ccf03b47daae56f219252d87b
This commit is contained in:
Xiangyu/Malcolm Chen
2019-03-29 15:57:11 -07:00
committed by android-build-merger
parent 37c9ced0e6 1c906d426d
commit 2e0ea1ab5e
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -43246,7 +43246,7 @@ package android.telephony {
field public static final int PHONE_TYPE_GSM = 1; // 0x1 field public static final int PHONE_TYPE_GSM = 1; // 0x1
field public static final int PHONE_TYPE_NONE = 0; // 0x0 field public static final int PHONE_TYPE_NONE = 0; // 0x0
field public static final int PHONE_TYPE_SIP = 3; // 0x3 field public static final int PHONE_TYPE_SIP = 3; // 0x3
field public static final int SET_OPPORTUNISTIC_SUB_INVALID_PARAMETER = 2; // 0x2 field public static final int SET_OPPORTUNISTIC_SUB_INACTIVE_SUBSCRIPTION = 2; // 0x2
field public static final int SET_OPPORTUNISTIC_SUB_SUCCESS = 0; // 0x0 field public static final int SET_OPPORTUNISTIC_SUB_SUCCESS = 0; // 0x0
field public static final int SET_OPPORTUNISTIC_SUB_VALIDATION_FAILED = 1; // 0x1 field public static final int SET_OPPORTUNISTIC_SUB_VALIDATION_FAILED = 1; // 0x1
field public static final int SIM_STATE_ABSENT = 1; // 0x1 field public static final int SIM_STATE_ABSENT = 1; // 0x1

4
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -2596,7 +2596,9 @@ public class SubscriptionManager {
* {@link SubscriptionManager#DEFAULT_SUBSCRIPTION_ID}, it means * {@link SubscriptionManager#DEFAULT_SUBSCRIPTION_ID}, it means
* it's unset and {@link SubscriptionManager#getDefaultDataSubscriptionId()} * it's unset and {@link SubscriptionManager#getDefaultDataSubscriptionId()}
* is used to determine which modem is preferred. * is used to determine which modem is preferred.
* @param needValidation whether validation is needed before switch happens. * @param needValidation whether Telephony will wait until the network is validated by
* connectivity service before switching data to it. More details see
* {@link NetworkCapabilities#NET_CAPABILITY_VALIDATED}.
* @param executor The executor of where the callback will execute. * @param executor The executor of where the callback will execute.
* @param callback Callback will be triggered once it succeeds or failed. * @param callback Callback will be triggered once it succeeds or failed.
* See {@link TelephonyManager.SetOpportunisticSubscriptionResult} * See {@link TelephonyManager.SetOpportunisticSubscriptionResult}

6
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -10351,7 +10351,7 @@ public class TelephonyManager {
@IntDef(prefix = {"SET_OPPORTUNISTIC_SUB"}, value = { @IntDef(prefix = {"SET_OPPORTUNISTIC_SUB"}, value = {
SET_OPPORTUNISTIC_SUB_SUCCESS, SET_OPPORTUNISTIC_SUB_SUCCESS,
SET_OPPORTUNISTIC_SUB_VALIDATION_FAILED, SET_OPPORTUNISTIC_SUB_VALIDATION_FAILED,
SET_OPPORTUNISTIC_SUB_INVALID_PARAMETER}) SET_OPPORTUNISTIC_SUB_INACTIVE_SUBSCRIPTION})
public @interface SetOpportunisticSubscriptionResult {} public @interface SetOpportunisticSubscriptionResult {}
/** /**
@@ -10365,9 +10365,9 @@ public class TelephonyManager {
public static final int SET_OPPORTUNISTIC_SUB_VALIDATION_FAILED = 1; public static final int SET_OPPORTUNISTIC_SUB_VALIDATION_FAILED = 1;
/** /**
* The parameter passed in is invalid. * The subscription is not valid. It must be an active opportunistic subscription.
*/ */
public static final int SET_OPPORTUNISTIC_SUB_INVALID_PARAMETER = 2; public static final int SET_OPPORTUNISTIC_SUB_INACTIVE_SUBSCRIPTION = 2;
/** @hide */ /** @hide */
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)