From ce140af98cf5803543a4d392c03a9c15b31f3c80 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Mon, 8 Apr 2019 20:28:44 +0900 Subject: [PATCH] Address leftover comments on aosp/894233 Bug: 129510344 Test: m, boots, wifi connects, resolves DNS Change-Id: Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613 --- .../java/com/android/server/ConnectivityService.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 9d2965afdb..e7598bd334 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -1769,14 +1769,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)); } }