Merge "Refactor isTetheringSupported() calls" am: e34c426fd3

am: 6f63d051d6

Change-Id: Iad6358dc2f1d10b322d22ec90543adc50882962d

diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge

diff --cc services/core/java/com/android/server/connectivity/Tethering.java
index 1bc7423,42754eb..d37dd18
--- 1/services/core/java/com/android/server/connectivity/Tethering.java
--- 2/services/core/java/com/android/server/connectivity/Tethering.java
+++ b/services/core/java/com/android/server/connectivity/Tethering.java
@@@ -1101,10 -1110,9 +1111,10 @@@ public class Tethering extends BaseNetw
          if (VDBG) Log.d(TAG, "setUsbTethering(" + enable + ")");
          UsbManager usbManager = (UsbManager) mContext.getSystemService(Context.USB_SERVICE);
          synchronized (mPublicSync) {
 -            usbManager.setCurrentFunction(enable ? UsbManager.USB_FUNCTION_RNDIS : null, false);
 +            usbManager.setCurrentFunctions(enable ? UsbManager.FUNCTION_RNDIS
 +                    : UsbManager.FUNCTION_NONE);
          }
-         return ConnectivityManager.TETHER_ERROR_NO_ERROR;
+         return TETHER_ERROR_NO_ERROR;
      }
  
      // TODO review API - figure out how to delete these entirely.

diff --cc tests/net/java/com/android/server/connectivity/TetheringTest.java
Simple merge