commit 3753f67bcd86ba4e39afc270bbe66c7de56723ab
author Chalard Jean <jchalard@google.com> Tue Apr 09 05:51:18 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 09 05:51:18 2019 +0000
tree d36bea7dded6ad862276ef174e3f7841fcbd0bce
parent 55319378ee87fa76b69af434fd8ae6d3d602fbb9
parent ce140af98cf5803543a4d392c03a9c15b31f3c80

Merge "Address leftover comments on aosp/894233"

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index e3382c3..28c3dbc 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1778,14 +1778,8 @@
             // 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));
             }
         }