Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b323b6ba authored by Chalard Jean's avatar Chalard Jean Committed by Aaron Huang
Browse files

Fix review comments on aosp/1213524 

This is necessary to avoid subsequent conflicts.

Test: none needed
Change-Id: I6e2cd9188e0e4bd7c71c6c56635f192dce73f325
Merged-In: I621cfbe165996c67b201ca2dd2f95a5ab9af10ee
parent 8de85f4b

core/java/android/net/ConnectivityManager.java

+0 −1
Original line number Diff line number Diff line
@@ -3341,7 +3341,6 @@ public class ConnectivityManager { 
    @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) {