commit fb40dd4d00bd3361b2535bc866e6c21eadc52558
author Wink Saville <wink@google.com> Thu Jun 12 17:02:31 2014 -0700
committer Wink Saville <wink@google.com> Fri Jun 13 13:30:57 2014 +0000
tree 01786f3e2bc9c803801f43fb8bc942e55a06e859
parent 6dfa6e2a9be08a3a0f152a7b772efc8ce2469bce

Merge kwd to master

Add initial IMS and MSIM support from klp-wireless-dev-mirror

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04

services/core/java/com/android/server/NetworkManagementService.java

diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java
index 362061e..d26f3fc 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -61,6 +61,7 @@
 import android.os.SystemProperties;
 import android.telephony.DataConnectionRealTimeInfo;
 import android.telephony.PhoneStateListener;
+import android.telephony.SubscriptionManager;
 import android.util.Log;
 import android.util.Slog;
 import android.util.SparseBooleanArray;
@@ -237,7 +238,9 @@
         mThread = new Thread(mConnector, NETD_TAG);
 
         mDaemonHandler = new Handler(FgThread.get().getLooper());
-        mPhoneStateListener = new PhoneStateListener(mDaemonHandler.getLooper()) {
+        mPhoneStateListener = new PhoneStateListener(
+                SubscriptionManager.DEFAULT_SUB_ID, // FIXME: What Subscription should be used??
+                mDaemonHandler.getLooper()) {
             public void onDataConnectionRealTimeInfoChanged(
                     DataConnectionRealTimeInfo dcRtInfo) {
                 notifyInterfaceClassActivity(ConnectivityManager.TYPE_MOBILE,