Merge "Do not register the callbacks in the constructor."

2011-06-07 18:18:56 -07:00
parent d26449fd76 f3204aad8e
commit ab2c05370e
1 changed files with 6 additions and 0 deletions
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -458,6 +458,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
                                  mTethering.getTetherableBluetoothRegexs().length != 0) &&
                                 mTethering.getUpstreamIfaceRegexs().length != 0);

+        try {
+            nmService.registerObserver(mTethering);
+        } catch (RemoteException e) {
+            loge("Error registering observer :" + e);
+        }
+
        if (DBG) {
            mInetLog = new ArrayList();
        }