joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

Browse source 
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
This commit is contained in:
Xin Li 2020-08-31 21:21:38 -07:00
commit 4afc1e6669
1 changed files with 49 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/java/android/net/ConnectivityManager.java
View file

@ -1725,7 +1725,6 @@ public class ConnectivityManager {
@UnsupportedAppUsage
public PacketKeepaliveCallback() {
}
/** The requested keepalive was successfully started. */
@UnsupportedAppUsage
public void onStarted() {}
@ -3177,6 +3176,7 @@ public class ConnectivityManager {
* @hide
*/
@RequiresPermission(anyOf = {
android.Manifest.permission.NETWORK_AIRPLANE_MODE,
android.Manifest.permission.NETWORK_SETTINGS,
android.Manifest.permission.NETWORK_SETUP_WIZARD,
android.Manifest.permission.NETWORK_STACK})
@ -3303,7 +3303,6 @@ public class ConnectivityManager {
android.Manifest.permission.NETWORK_FACTORY})
public Network registerNetworkAgent(Messenger messenger, NetworkInfo ni, LinkProperties lp,
NetworkCapabilities nc, int score, NetworkAgentConfig config, int providerId) {
try {
return mService.registerNetworkAgent(messenger, ni, lp, nc, score, config, providerId);
} catch (RemoteException e) {