commit 35667ce4991f9128c9e5ed9be04d3df398d55d06
author Lorenzo Colitti <lorenzo@google.com> Mon Mar 15 14:24:34 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 15 14:24:34 2021 +0000
tree 394aeabd73d92db2a1adda1a4fee18e056fd9444
parent 2b89f2ae7f33eb0cd761e067ee1df3e71d185e01
parent 3e0314d68f33eb584ccd7a252928085ada8b2a71

Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS" am: 85bea4887f am: 3e0314d68f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635045

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6edda160620b4a3cbcf85f21081a41d959cf3173

services/core/java/com/android/server/TestNetworkService.java

diff --git a/services/core/java/com/android/server/TestNetworkService.java b/services/core/java/com/android/server/TestNetworkService.java
index ee61067..f566277 100644
--- a/services/core/java/com/android/server/TestNetworkService.java
+++ b/services/core/java/com/android/server/TestNetworkService.java
@@ -90,7 +90,12 @@
         mCm = mContext.getSystemService(ConnectivityManager.class);
         mNetworkProvider = new NetworkProvider(mContext, mHandler.getLooper(),
                 TEST_NETWORK_PROVIDER_NAME);
-        mCm.registerNetworkProvider(mNetworkProvider);
+        final long token = Binder.clearCallingIdentity();
+        try {
+            mCm.registerNetworkProvider(mNetworkProvider);
+        } finally {
+            Binder.restoreCallingIdentity(token);
+        }
     }
 
     /**