Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS"

2021-03-15 13:09:14 +00:00
parent c8e73fa90b 10cb5421e4
commit ac31254623
1 changed files with 6 additions and 1 deletions
--- a/services/core/java/com/android/server/TestNetworkService.java
+++ b/services/core/java/com/android/server/TestNetworkService.java
@@ -90,7 +90,12 @@ class TestNetworkService extends ITestNetworkManager.Stub {
        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);
+        }
    }

    /**