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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib9169b66fd9f5bccfbbfaa69392ff176e41d4b53
This commit is contained in:
Lorenzo Colitti
2021-03-15 15:09:22 +00:00
committed by Automerger Merge Worker

View File

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