commit fb5ed4b678801966ae4130b97d6ef83ebc106ea0
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 25 00:46:25 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 25 00:46:25 2020 +0000
tree 4fc31b106e28572afcbcc12f8fe50d0f21d003fe
parent bb87d5aeb58a0805f9e90e40245933ef5eae5dcd
parent c3f8d41d4d0886331022993af8910129c30b20c0

Merge "test: LinkProperties: Unique Route Destinations" am: c3f8d41d4d

Change-Id: I9261a5e5f6b18390aac34cd25337f211b19a7641

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 589b1aa..0c46462 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -3342,6 +3342,7 @@
     @RequiresPermission(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) {