commit 2b39d6d2a0f6698a1e2a0c6ca3ca4a01f3ead91d
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 25 12:08:46 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 25 12:08:46 2018 +0000
tree 79f22c1355e236504380f26809c23ea8d1647a8c
parent ca1fbb6b12f2410e213466211ff4a9bb4cbc5def
parent 7230652f52503dd69b3e6f16568865b695c7042c

Merge "Prefer default Internet network for upstream tethering."

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 49d60a7..0b24db0 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -868,6 +868,10 @@
             public boolean isTetheringSupported() {
                 return ConnectivityService.this.isTetheringSupported();
             }
+            @Override
+            public NetworkRequest getDefaultNetworkRequest() {
+                return mDefaultRequest;
+            }
         };
         return new Tethering(mContext, mNetd, mStatsService, mPolicyManager,
                 IoThread.get().getLooper(), new MockableSystemProperties(),
@@ -885,7 +889,7 @@
 
     private NetworkRequest createDefaultInternetRequestForTransport(
             int transportType, NetworkRequest.Type type) {
-        NetworkCapabilities netCap = new NetworkCapabilities();
+        final NetworkCapabilities netCap = new NetworkCapabilities();
         netCap.addCapability(NET_CAPABILITY_INTERNET);
         netCap.addCapability(NET_CAPABILITY_NOT_RESTRICTED);
         if (transportType > -1) {