Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chia-chi Yeh
2011-06-07 18:18:56 -07:00
committed by Android (Google) Code Review
parent 0e9e03f554 008ff39b7c
commit 5bc7c93ca7
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/ConnectivityService.java
View File

@@ -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();
}

7
services/java/com/android/server/connectivity/Tethering.java
View File

@@ -129,13 +129,6 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
mNMService = nmService;
mLooper = looper;
// register for notifications from NetworkManagement Service
try {
mNMService.registerObserver(this);
} catch (RemoteException e) {
Log.e(TAG, "Error registering observer :" + e);
}
mIfaces = new HashMap<String, TetherInterfaceSM>();
// make our own thread so we don't anr the system