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

Merge "Adding validate before switch feature."

Browse Source 
am: f2cf09c945

Change-Id: Ie3f4429c1d7efefb83cf8289481a37adddd83801
This commit is contained in:
Xiangyu/Malcolm Chen
2019-02-19 21:38:21 -08:00
committed by android-build-merger
parent bfd852a7bb f2cf09c945
commit 86ca0ba02f
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2583,8 +2583,14 @@ public class SubscriptionManager {
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void setPreferredDataSubscriptionId(int subId) {
if (VDBG) logd("[setPreferredDataSubscriptionId]+ subId:" + subId);
setSubscriptionPropertyHelper(DEFAULT_SUBSCRIPTION_ID, "setPreferredDataSubscriptionId",
(iSub)-> iSub.setPreferredDataSubscriptionId(subId));
try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
iSub.setPreferredDataSubscriptionId(subId);
}
} catch (RemoteException ex) {
// ignore it
}
}
/**

2
telephony/java/com/android/internal/telephony/ISub.aidl
View File

@@ -220,7 +220,7 @@ interface ISub {
* @hide
*
*/
int setPreferredDataSubscriptionId(int subId);
void setPreferredDataSubscriptionId(int subId);
/**
* Get which subscription is preferred for cellular data.