commit d2c4c7f04b31c9d0b97d617c4fd864d28e02f964
author Linux Build Service Account <lnxbuild@localhost> Thu Mar 19 13:44:46 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Mar 19 13:44:46 2015 -0700
tree 544030e324ef7e4094d1b09f8e745cd16bd6f49e
parent 4134e3c019104cd0a2ae9c6cf01552c6c47ebb7a
parent 5445bbca29b725ea16cc870da3b43fd28e6bec22

Merge "Implement missing DSDA TelecomManager APIs."

src/com/android/server/telecom/TelecomService.java

diff --git a/src/com/android/server/telecom/TelecomService.java b/src/com/android/server/telecom/TelecomService.java
index e175d7c..08131b4 100644
--- a/src/com/android/server/telecom/TelecomService.java
+++ b/src/com/android/server/telecom/TelecomService.java
@@ -702,10 +702,20 @@
         }
 
         @Override
-        public long getActiveSubscription() { return 0; }
+        public int getActiveSubscription() {
+            enforceReadPermission();
+            String activeSub = mCallsManager.getActiveSubscription();
+            return (activeSub == null) ? SubscriptionManager.INVALID_SUBSCRIPTION_ID :
+                    Integer.parseInt(activeSub);
+        }
 
         @Override
-        public void switchToOtherActiveSub(long subId) { }
+        public void switchToOtherActiveSub(int subId) {
+            enforceModifyPermission();
+            String activeSub = (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID)
+                    ? null : String.valueOf(subId);
+            mCallsManager.switchToOtherActiveSub(activeSub, false);
+        }
 
         /**
          * Dumps the current state of the TelecomService.  Used when generating problem reports.