From abbc41e85914b26b762f64eebfc9cca601b2423a Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Wed, 23 Jul 2014 11:44:01 -0700
Subject: [PATCH] Fix DUN-based tethering.

It was calling into dead ConnectivityService code rather than using
the new ConnectivityManager shim code.

bug:15221541
Change-Id: I1e3eea8a658a162ce36673ed1cf7b1e7e4372c42
---
 core/java/android/net/ConnectivityManager.java                 | 2 +-
 services/core/java/com/android/server/ConnectivityService.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index e31f012c3d..0df4d45a85 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -1196,7 +1196,7 @@ public class ConnectivityManager {
         };
     }
 
-    private HashMap<NetworkCapabilities, LegacyRequest> sLegacyRequests =
+    private static HashMap<NetworkCapabilities, LegacyRequest> sLegacyRequests =
             new HashMap<NetworkCapabilities, LegacyRequest>();
 
     private NetworkRequest findRequestForFeature(NetworkCapabilities netCap) {
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index e44f578e20..36be58cf49 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -788,7 +788,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
             }
         }
 
-        mTethering = new Tethering(mContext, mNetd, statsService, this, mHandler.getLooper());
+        mTethering = new Tethering(mContext, mNetd, statsService, mHandler.getLooper());
 
         //set up the listener for user state for creating user VPNs
         IntentFilter intentFilter = new IntentFilter();