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

1 files changed, 2 insertions, 0 deletions

diff --git a/services/net/java/android/net/ip/IpClientManager.java b/services/net/java/android/net/ip/IpClientManager.java
index 274b6dc1769b..b45405f39f0f 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);
         }
     }