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

Commit 7a76252c authored by Chalard Jean's avatar Chalard Jean Committed by android-build-merger
Browse files

Merge "Address leftover comments on aosp/894233" am: 8781aa3f 

am: 7e5e4734

Change-Id: Ia08104f839ef37139a8761e2e625bb10c94c275f
parents 2f052818 7e5e4734

services/core/java/com/android/server/ConnectivityService.java

+2 −8
Original line number Diff line number Diff line
@@ -1778,14 +1778,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            // callback from each caller type. Need to re-factor NetdEventListenerService to allow

            // multiple NetworkMonitor registrants.

            if (nai != null && nai.satisfies(mDefaultRequest)) {

                final long token = Binder.clearCallingIdentity();

                try {

                    nai.networkMonitor().notifyDnsResponse(returnCode);

                } catch (RemoteException e) {

                    e.rethrowFromSystemServer();

                } finally {

                    Binder.restoreCallingIdentity(token);

                }

                Binder.withCleanCallingIdentity(() ->

                        nai.networkMonitor().notifyDnsResponse(returnCode));

            }

        }