commit aba23b3f4326ecc9c25b5e934234295c8d015bfe
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 20 05:30:20 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 20 05:30:20 2020 +0000
tree 176f87570ec8c7c3ddd964d955af476d642ffa49
parent 3114fc231034f069fec692f4e5c9514f5f666dce
parent 4d95254cb3eee378933960bb4c5221c87d99ea8b

Merge "Sanitize owner UID iff owning app does not have location permissions." am: 4d95254cb3

Change-Id: Ie5876d063d7440aacc57d48cb4573798303910ea

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