commit e6f588ab90d4f9820180033e475095dbf042ebd1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 12 18:51:59 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 12 18:51:59 2020 +0000
tree 3c7f2eb658b3f26c11a17915fa60940ee8fe2dee
parent d876b4ef7615cf92d916f43e4ee63d806842be12
parent 7b59ec507cfb38bf987640d6a69e9a68c6bd3eb3

Merge "NetworkRequest: Embed requestor uid & packageName" am: 7b59ec507c

Change-Id: Ic4f9247e18a9d1cc22b26500b47da1af2d9b011d

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index cb31404..f24de88 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) {