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

Commit 971d9c99 authored by Chalard Jean's avatar Chalard Jean
Browse files

Address leftover comments on aosp/894233 

Cherry-pick from commit 415f523f,
with small conflict resolution.

Bug: 129510344
Test: m, boots, wifi connects, resolves DNS
Change-Id: Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613
Merged-In: Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613
Merged-In: Ia08104f839ef37139a8761e2e625bb10c94c275f
parent b08726bb

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

+2 −5
Original line number Diff line number Diff line
@@ -1767,11 +1767,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            // caller type. Need to re-factor NetdEventListenerService to allow multiple

            // NetworkMonitor registrants.

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

                try {

                    nai.networkMonitor().notifyDnsResponse(returnCode);

                } catch (RemoteException e) {

                    e.rethrowFromSystemServer();

                }

                Binder.withCleanCallingIdentity(() ->

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

            }

        }