commit e1f80469fad97019bc2bcfa39dc474bd1b2e8373
author Remi NGUYEN VAN <reminv@google.com> Wed Jan 23 15:05:00 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 23 15:05:00 2019 +0000
tree 735ece4dbed44d6e037a65e0081cd2d6ae6df673
parent d44768965b0aeb15b1643353bc454f0cbcbb5f63
parent 4a2eb87a8e16874938fa1ce7d39bbfa7b59b9890

Merge changes I1250730c,I7d00848c

* changes:
  Create a wrapper for IpClient
  Move IpClient to NetworkStack

src/com/android/server/connectivity/NetworkMonitor.java

diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java
index a3d7852..6b31b82 100644
--- a/src/com/android/server/connectivity/NetworkMonitor.java
+++ b/src/com/android/server/connectivity/NetworkMonitor.java
@@ -247,7 +247,6 @@
     private final TelephonyManager mTelephonyManager;
     private final WifiManager mWifiManager;
     private final ConnectivityManager mCm;
-    private final NetworkRequest mDefaultRequest;
     private final IpConnectivityLog mMetricsLog;
     private final Dependencies mDependencies;
 
@@ -336,7 +335,6 @@
         mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
         mCm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        mDefaultRequest = defaultRequest;
 
         // CHECKSTYLE:OFF IndentationCheck
         addState(mDefaultState);
@@ -486,8 +484,7 @@
     }
 
     private boolean isValidationRequired() {
-        return NetworkMonitorUtils.isValidationRequired(
-                mDefaultRequest.networkCapabilities, mNetworkCapabilities);
+        return NetworkMonitorUtils.isValidationRequired(mNetworkCapabilities);
     }