diff options
| author | 2019-01-30 22:34:22 +0000 | |
|---|---|---|
| committer | 2019-01-30 22:34:22 +0000 | |
| commit | ee269f6e932effe950c888262b6206e2461f639a (patch) | |
| tree | 5f67336a6b4e59f20fa13c54b8eff2abdd7f3b51 | |
| parent | bcd4bddc22a2e7a42bcec83d5e92c4ed83175f99 (diff) | |
| parent | 8d04800b7f0ebb856e6b26c3df098d34733d0fd6 (diff) | |
Merge "Adding validate before switch feature."
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionManager.java | 10 | ||||
| -rwxr-xr-x | telephony/java/com/android/internal/telephony/ISub.aidl | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 869cf1cf9e14..dfe36efcd5d1 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -2577,8 +2577,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 + } } /** diff --git a/telephony/java/com/android/internal/telephony/ISub.aidl b/telephony/java/com/android/internal/telephony/ISub.aidl index a49d2d976d16..6ce9de4ca677 100755 --- a/telephony/java/com/android/internal/telephony/ISub.aidl +++ b/telephony/java/com/android/internal/telephony/ISub.aidl @@ -220,7 +220,7 @@ interface ISub { * @hide * */ - int setPreferredDataSubscriptionId(int subId); + void setPreferredDataSubscriptionId(int subId); /** * Get which subscription is preferred for cellular data. |