commit d3844d856da54b4e9d0b220067153d92c38ee451
author Chalard Jean <jchalard@google.com> Tue Mar 09 07:41:13 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 09 07:41:13 2021 +0000
tree af2b1bd70d531ab15aa43ad81cf6f61241a0d8c0
parent cb2213216c9e3d1aadda747f70d74496486c8ae2
parent c6170bb2f3b0529eb3254ee9a9b934cf01797e1c

Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity"

framework/src/android/net/ConnectivityManager.java

diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java
index a6dc9ce..45ed317 100644
--- a/framework/src/android/net/ConnectivityManager.java
+++ b/framework/src/android/net/ConnectivityManager.java
@@ -2905,10 +2905,14 @@
         ResultReceiver wrappedListener = new ResultReceiver(null) {
             @Override
             protected void onReceiveResult(int resultCode, Bundle resultData) {
-                Binder.withCleanCallingIdentity(() ->
-                            executor.execute(() -> {
-                                listener.onTetheringEntitlementResult(resultCode);
-                            }));
+                final long token = Binder.clearCallingIdentity();
+                try {
+                    executor.execute(() -> {
+                        listener.onTetheringEntitlementResult(resultCode);
+                    });
+                } finally {
+                    Binder.restoreCallingIdentity(token);
+                }
             }
         };