commit 9e1c910ffffd08f90b504b7bdfeba0876254c41f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 12 23:55:00 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 12 23:55:00 2020 +0000
tree ee8070c6c41a8027304413c6501add1c6f55c3b3
parent e6f588ab90d4f9820180033e475095dbf042ebd1
parent 948f0f987838fb82d6798cf834681e024b70cd44

Merge "Revert "NetworkRequest: Embed requestor uid & packageName"" am: 948f0f9878

Change-Id: I00dd341f699d2a22cc3d190b43314a49bee9062a

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 212c716..94eda01 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -3341,6 +3341,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) {