commit fb8a7aab88dd99c3e72a9014d67b7349dd9ed97b
author Sooraj Sasindran <sasindran@google.com> Wed Dec 19 17:34:05 2018 -0800
committer Sooraj Sasindran <sasindran@google.com> Wed Jan 09 18:04:38 2019 +0000
tree f79feddee6df2579c2d66cb8fc1801c380800689
parent 4cdc37e1e1d0ca003aaa485696c572a082b30f93

Pass DEAFULT_SUBSCRIPTION_ID for primary

pass DEFAULT_SUBSCRIPTION_ID for data on primary subscription

Test: verified that data switches back to primary
Bug: 121284721
Merged-In: I92671376af74fa13101a9a0a0e17e5874107de5f
Change-Id: I92671376af74fa13101a9a0a0e17e5874107de5f

src/com/android/ans/ANSProfileSelector.java

diff --git a/src/com/android/ans/ANSProfileSelector.java b/src/com/android/ans/ANSProfileSelector.java
index f3e983a..43b8cdf 100644
--- a/src/com/android/ans/ANSProfileSelector.java
+++ b/src/com/android/ans/ANSProfileSelector.java
@@ -481,14 +481,6 @@
         return false;
     }
 
-    /**
-     * select primary profile for data
-     */
-    public void selectPrimaryProfileForData() {
-        mSubscriptionManager.setPreferredData(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-        mCurrentDataSubId = mSubscriptionManager.getDefaultSubscriptionId();
-    }
-
     public void startProfileSelection(ArrayList<AvailableNetworkInfo> availableNetworks) {
         if (availableNetworks == null || availableNetworks.size() == 0) {
             return;
@@ -512,11 +504,11 @@
 
     /**
      * select opportunistic profile for data if passing a valid subId.
-     * @param subId : opportunistic subId or SubscriptionManager.INVALID_SUBSCRIPTION_ID if
+     * @param subId : opportunistic subId or SubscriptionManager.DEFAULT_SUBSCRIPTION_ID if
      *              deselecting previously set preference.
      */
     public boolean selectProfileForData(int subId) {
-        if ((subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID)
+        if ((subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID)
                 || (isOpprotunisticSub(subId) && isActiveSub(subId))) {
             mSubscriptionManager.setPreferredData(subId);
             mCurrentDataSubId = subId;