Merge "Remove requestRouteToHost and {start,stop}UsingNetworkFeature."
This commit is contained in:
committed by
Android (Google) Code Review
commit
8989d2edca
@@ -1163,6 +1163,7 @@ public class ConnectivityManager {
|
|||||||
* {@link #requestNetwork(NetworkRequest, NetworkCallback)} API.
|
* {@link #requestNetwork(NetworkRequest, NetworkCallback)} API.
|
||||||
* In {@link VERSION_CODES#M}, and above, this method is unsupported and will
|
* In {@link VERSION_CODES#M}, and above, this method is unsupported and will
|
||||||
* throw {@code UnsupportedOperationException} if called.
|
* throw {@code UnsupportedOperationException} if called.
|
||||||
|
* @removed
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public int startUsingNetworkFeature(int networkType, String feature) {
|
public int startUsingNetworkFeature(int networkType, String feature) {
|
||||||
@@ -1219,6 +1220,7 @@ public class ConnectivityManager {
|
|||||||
* {@link #unregisterNetworkCallback(NetworkCallback)} API.
|
* {@link #unregisterNetworkCallback(NetworkCallback)} API.
|
||||||
* In {@link VERSION_CODES#M}, and above, this method is unsupported and will
|
* In {@link VERSION_CODES#M}, and above, this method is unsupported and will
|
||||||
* throw {@code UnsupportedOperationException} if called.
|
* throw {@code UnsupportedOperationException} if called.
|
||||||
|
* @removed
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public int stopUsingNetworkFeature(int networkType, String feature) {
|
public int stopUsingNetworkFeature(int networkType, String feature) {
|
||||||
@@ -1633,6 +1635,7 @@ public class ConnectivityManager {
|
|||||||
* {@link #bindProcessToNetwork} and {@link Network#getSocketFactory} API.
|
* {@link #bindProcessToNetwork} and {@link Network#getSocketFactory} API.
|
||||||
* In {@link VERSION_CODES#M}, and above, this method is unsupported and will
|
* In {@link VERSION_CODES#M}, and above, this method is unsupported and will
|
||||||
* throw {@code UnsupportedOperationException} if called.
|
* throw {@code UnsupportedOperationException} if called.
|
||||||
|
* @removed
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public boolean requestRouteToHost(int networkType, int hostAddress) {
|
public boolean requestRouteToHost(int networkType, int hostAddress) {
|
||||||
|
|||||||
Reference in New Issue
Block a user