Merge "More concisely export whether we have a "tetherable configuration"" am: edea114308 am: 9d02ee9030 am: fa0b8e4cee

am: 52e97fcb8a Change-Id: I290df5269739bc7fb5ebc8614a96c38bf7faf367
2017-01-23 07:30:22 +00:00
parent 49211a88ba 52e97fcb8a
commit b3ecedaedc
1 changed files with 1 additions and 4 deletions
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3121,10 +3121,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