Merge "Address leftover comments on aosp/894233" (7e5e4734) · Commits · e / os / android_frameworks_base

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));
		}
		}