LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Call clearCallingIdentity before notifyDnsResponse"

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2019-04-05 01:54:08 +00:00
committed by Gerrit Code Review
parent e2908b64dd 6bf8f0fbd9
commit c7b33f7572
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -1761,16 +1761,17 @@ public class ConnectivityService extends IConnectivityManager.Stub
// the caller thread of registerNetworkAgent. Thus, it's not allowed to register netd // the caller thread of registerNetworkAgent. Thus, it's not allowed to register netd
// event callback for certain nai. e.g. cellular. Register here to pass to // event callback for certain nai. e.g. cellular. Register here to pass to
// NetworkMonitor instead. // NetworkMonitor instead.
// TODO: Move the Dns Event to NetworkMonitor. Use Binder.clearCallingIdentity() in // TODO: Move the Dns Event to NetworkMonitor. NetdEventListenerService only allow one
// registerNetworkAgent to have NetworkMonitor created with system process as design // callback from each caller type. Need to re-factor NetdEventListenerService to allow
// expectation. Also, NetdEventListenerService only allow one callback from each // multiple NetworkMonitor registrants.
// caller type. Need to re-factor NetdEventListenerService to allow multiple
// NetworkMonitor registrants.
if (nai != null && nai.satisfies(mDefaultRequest)) { if (nai != null && nai.satisfies(mDefaultRequest)) {
final long token = Binder.clearCallingIdentity();
try { try {
nai.networkMonitor().notifyDnsResponse(returnCode); nai.networkMonitor().notifyDnsResponse(returnCode);
} catch (RemoteException e) { } catch (RemoteException e) {
e.rethrowFromSystemServer(); e.rethrowFromSystemServer();
} finally {
Binder.restoreCallingIdentity(token);
} }
} }
} }