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

am 61c0818f: Merge "Watch network subtype, tethering teardown, empty."

Browse Source 
* commit '61c0818f2425691e67921ee41ca80e62d2cb9004':
  Watch network subtype, tethering teardown, empty.
This commit is contained in:
Jeff Sharkey
2011-09-25 23:46:03 -07:00
committed by Android Git Automerger
parent 513d200fd0 61c0818f24
commit b7b79b10fd
6 changed files with 102 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/SystemServer.java
View File

@@ -369,7 +369,8 @@ class ServerThread extends Thread {
try {
Slog.i(TAG, "Connectivity Service");
connectivity = new ConnectivityService(context, networkManagement, networkPolicy);
connectivity = new ConnectivityService(
context, networkManagement, networkStats, networkPolicy);
ServiceManager.addService(Context.CONNECTIVITY_SERVICE, connectivity);
networkStats.bindConnectivityManager(connectivity);
networkPolicy.bindConnectivityManager(connectivity);