Merge "Remove legacy network factories" am: 2bd97d70e2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574684 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I747f6352eb08589c00e77915eb17640e1d5f0ee1
This commit is contained in:
@@ -3231,32 +3231,6 @@ public class ConnectivityManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** {@hide} - returns the factory serial number */
|
|
||||||
@UnsupportedAppUsage
|
|
||||||
@RequiresPermission(anyOf = {
|
|
||||||
NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,
|
|
||||||
android.Manifest.permission.NETWORK_FACTORY})
|
|
||||||
public int registerNetworkFactory(Messenger messenger, String name) {
|
|
||||||
try {
|
|
||||||
return mService.registerNetworkFactory(messenger, name);
|
|
||||||
} catch (RemoteException e) {
|
|
||||||
throw e.rethrowFromSystemServer();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** {@hide} */
|
|
||||||
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
|
|
||||||
@RequiresPermission(anyOf = {
|
|
||||||
NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,
|
|
||||||
android.Manifest.permission.NETWORK_FACTORY})
|
|
||||||
public void unregisterNetworkFactory(Messenger messenger) {
|
|
||||||
try {
|
|
||||||
mService.unregisterNetworkFactory(messenger);
|
|
||||||
} catch (RemoteException e) {
|
|
||||||
throw e.rethrowFromSystemServer();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Registers the specified {@link NetworkProvider}.
|
* Registers the specified {@link NetworkProvider}.
|
||||||
* Each listener must only be registered once. The listener can be unregistered with
|
* Each listener must only be registered once. The listener can be unregistered with
|
||||||
|
|||||||
@@ -156,9 +156,6 @@ interface IConnectivityManager
|
|||||||
|
|
||||||
boolean requestBandwidthUpdate(in Network network);
|
boolean requestBandwidthUpdate(in Network network);
|
||||||
|
|
||||||
int registerNetworkFactory(in Messenger messenger, in String name);
|
|
||||||
void unregisterNetworkFactory(in Messenger messenger);
|
|
||||||
|
|
||||||
int registerNetworkProvider(in Messenger messenger, in String name);
|
int registerNetworkProvider(in Messenger messenger, in String name);
|
||||||
void unregisterNetworkProvider(in Messenger messenger);
|
void unregisterNetworkProvider(in Messenger messenger);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user