From d78dac0bd19728cf7199d9b695b3f33d8202a394 Mon Sep 17 00:00:00 2001 From: Malcolm Chen Date: Thu, 24 Jan 2019 16:33:51 -0800 Subject: [PATCH] Adding validate before switch feature. In CBRS DSDS mode, switching data to CBRS network will require validation first. Adding a component of CellularNetworkValidator to trigger the validation and pass the result back to PhoneSwitcher. Bug: 118348832 Test: manual Change-Id: I689aa494f031834b5cee76906922ebdafa9c77ed Merged-In: I689aa494f031834b5cee76906922ebdafa9c77ed --- telephony/java/android/telephony/SubscriptionManager.java | 10 ++++++++-- 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 5b9e23228dcb..52cab556d11c 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -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 + } } /** 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. -- 2.11.0