From 246c5d92c61232b617fd6208df34c39201268be1 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Thu, 17 Jun 2021 21:43:38 +0900 Subject: [PATCH] Apply ag/12775659 to IpClientManager. ag/12775659 was merged only in internal gerrit and prevents us from moving or deleting IpClientManager in AOSP. Apply to IpClientManager the changes made in that CL. Test: m Bug: 155703208 Merged-In: I74cb958b68d55a647547aae21baff6ddc364859b Change-Id: I9e1f9bf5b28b87cfd40cf3abbf8bcd9abf46ecfe --- services/net/java/android/net/ip/IpClientManager.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/net/java/android/net/ip/IpClientManager.java b/services/net/java/android/net/ip/IpClientManager.java index 274b6dc1769be..b45405f39f0f0 100644 --- a/services/net/java/android/net/ip/IpClientManager.java +++ b/services/net/java/android/net/ip/IpClientManager.java @@ -88,6 +88,8 @@ public class IpClientManager { } catch (RemoteException e) { log("Error confirming IpClient configuration", e); return false; + } finally { + Binder.restoreCallingIdentity(token); } }