DctController: fix mismerge with getTopPriorityRequestPhoneId()

Add back logic from change-id
I57fee028d9ac0e91d94eb70f8ea75c7fcb5f7087

Change-Id: Ice8026fa75126903bdb756c663008b68fafef60b
Signed-off-by: Roman Birg <roman@cyngn.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/src/java/com/android/internal/telephony/dataconnection/DctController.java b/src/java/com/android/internal/telephony/dataconnection/DctController.java
index 1a6024a2e..c630cb68e 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DctController.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DctController.java
@@ -560,12 +560,24 @@ public class DctController extends Handler {
         int priority = -1;
         int subId;
 
+        int activePhoneId = -1;
+        for (int i=0; i<mDcSwitchStateMachine.length; i++) {
+            if (!mDcSwitchAsyncChannel[i].isIdleSync()) {
+                activePhoneId = i;
+                break;
+            }
+        }
+
         for (RequestInfo requestInfo : mRequestInfos.values()) {
             logd("getTopPriorityRequestPhoneId requestInfo=" + requestInfo);
             if (requestInfo.priority > priority) {
                 priority = requestInfo.priority;
                 topSubId = requestInfo.request.networkCapabilities.getNetworkSpecifier();
                 retRequestInfo = requestInfo;
+            } else if (priority == requestInfo.priority) {
+                if (requestInfo.executedPhoneId == activePhoneId) {
+                   topSubId = requestInfo.request.networkCapabilities.getNetworkSpecifier();
+               }
             }
         }
         if (TextUtils.isEmpty(topSubId)) {