From 21933391e8d82adb80e8156d3d4a08fc09815741 Mon Sep 17 00:00:00 2001
From: Erik Kline <ek@google.com>
Date: Mon, 23 Jan 2017 13:01:58 +0900
Subject: [PATCH] More concisely export whether we have a "tetherable
 configuration"

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - vanilla WiFi-to-mobile tethering works
Bug: 32163131
Change-Id: I20dd36b5bf7fc55a639c76ea4bdb55b650654881
---
 .../core/java/com/android/server/ConnectivityService.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index b3627adcf6..5549ced4a3 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3130,10 +3130,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
                 Settings.Global.TETHER_SUPPORTED, defaultVal) != 0)
                 && !mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING);
         return tetherEnabledInSettings && mUserManager.isAdminUser() &&
-                ((mTethering.getTetherableUsbRegexs().length != 0 ||
-                mTethering.getTetherableWifiRegexs().length != 0 ||
-                mTethering.getTetherableBluetoothRegexs().length != 0) &&
-                mTethering.getUpstreamIfaceTypes().length != 0);
+               mTethering.hasTetherableConfiguration();
     }
 
     @Override