Snap for 6374617 from fe295735335c6e51af11d092392785b9c20b672f to mainline-release

Change-Id: I252ad5b62ed86d63d4b93990377613033719c3c1
This commit is contained in:
android-build-team Robot
2020-04-08 07:17:55 +00:00

View File

@@ -556,12 +556,12 @@ public abstract class NetworkAgent {
@NonNull
public Network register() {
if (VDBG) log("Registering NetworkAgent");
final ConnectivityManager cm = (ConnectivityManager) mInitialConfiguration.context
.getSystemService(Context.CONNECTIVITY_SERVICE);
synchronized (mRegisterLock) {
if (mNetwork != null) {
throw new IllegalStateException("Agent already registered");
}
final ConnectivityManager cm = (ConnectivityManager) mInitialConfiguration.context
.getSystemService(Context.CONNECTIVITY_SERVICE);
mNetwork = cm.registerNetworkAgent(new Messenger(mHandler),
new NetworkInfo(mInitialConfiguration.info),
mInitialConfiguration.properties, mInitialConfiguration.capabilities,