Merge "Address leftover comments on aosp/894233" am: 3753f67bcd

am: c4b0483288

Change-Id: Ia08104f839ef37139a8761e2e625bb10c94c275f
This commit is contained in:
Chalard Jean
2019-04-08 23:52:35 -07:00
committed by android-build-merger

View File

@@ -1778,14 +1778,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
// callback from each caller type. Need to re-factor NetdEventListenerService to allow // callback from each caller type. Need to re-factor NetdEventListenerService to allow
// multiple NetworkMonitor registrants. // multiple NetworkMonitor registrants.
if (nai != null && nai.satisfies(mDefaultRequest)) { if (nai != null && nai.satisfies(mDefaultRequest)) {
final long token = Binder.clearCallingIdentity(); Binder.withCleanCallingIdentity(() ->
try { nai.networkMonitor().notifyDnsResponse(returnCode));
nai.networkMonitor().notifyDnsResponse(returnCode);
} catch (RemoteException e) {
e.rethrowFromSystemServer();
} finally {
Binder.restoreCallingIdentity(token);
}
} }
} }