From: Luke Huang <huangluke@google.com>
Date: Mon, 1 Oct 2018 03:01:33 +0000 (+0000)
Subject: Merge "Rename object mNetd to mNetworkManagementService"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4ad36b7c9d621c5934946ade703c22c711024471;p=android-x86%2Fframeworks-base.git

Merge "Rename object mNetd to mNetworkManagementService"
---

4ad36b7c9d621c5934946ade703c22c711024471
diff --cc services/core/java/com/android/server/ConnectivityService.java
index 64ad912342ad,1d142f476a19..4e75f3b6c42d
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@@ -5103,9 -5091,9 +5103,9 @@@ public class ConnectivityService extend
  
      private void makeDefault(NetworkAgentInfo newNetwork) {
          if (DBG) log("Switching to new default network: " + newNetwork);
 -        setupDataActivityTracking(newNetwork);
 +
          try {
-             mNetd.setDefaultNetId(newNetwork.network.netId);
+             mNMS.setDefaultNetId(newNetwork.network.netId);
          } catch (Exception e) {
              loge("Exception setting default network :" + e);
          }