commit 9b08eb340a3a3785eeef6641c3bfd5e826d33f25
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 02 05:10:35 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 02 05:10:35 2020 +0000
tree 2a1a80fd6980b96b98203e691a5064777468a55e
parent f0de11d057951c0972a71ad6947f431ef8d08d83
parent e8a5275bc95b90e67b7bbfcdc2a8351dd1d83054

Merge "Always set NetworkInfo objects to available." am: e8a5275bc9

Change-Id: I89b53d1a254ca43566286b1309ce88b8a1518c4a

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) {