Merge "Use framework-tethering-stub instead of framework-tethering" am: 7fa9971ec6

Change-Id: I2caaa5f804a510bcc18822b784c129e9b058ea03
This commit is contained in:
Automerger Merge Worker
2020-02-19 09:54:51 +00:00

View File

@@ -2424,14 +2424,14 @@ public class ConnectivityManager {
/** /**
* Get the set of tethered dhcp ranges. * Get the set of tethered dhcp ranges.
* *
* @return an array of 0 or more {@code String} of tethered dhcp ranges. * @deprecated This method is not supported.
* @deprecated This API just return the default value which is not used in DhcpServer. * TODO: remove this function when all of clients are removed.
* {@hide} * {@hide}
*/ */
@RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)
@Deprecated @Deprecated
public String[] getTetheredDhcpRanges() { public String[] getTetheredDhcpRanges() {
return getTetheringManager().getTetheredDhcpRanges(); throw new UnsupportedOperationException("getTetheredDhcpRanges is not supported");
} }
/** /**