commit ac3125462354d44a6a2047acf5d5c60309f2f11a
author Lorenzo Colitti <lorenzo@google.com> Mon Mar 15 13:09:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 15 13:09:14 2021 +0000
tree 394aeabd73d92db2a1adda1a4fee18e056fd9444
parent c8e73fa90b3d47deaf40e46cc40928ae7507ccaf
parent 10cb5421e47db62d69c7965da9fbc4f87e610a02

Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS"

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);
+        }
     }
 
     /**