Merge "Prevent a 4-way binder interlock leading to a leak." (88cf9c53) · Commits · e / os / android_frameworks_base

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

+10 −9

Original line number	Diff line number	Diff line
		@@ -169,6 +169,7 @@ import com.android.internal.util.MessageUtils;
		import com.android.internal.util.WakeupMessage;
		import com.android.internal.util.XmlUtils;
		import com.android.server.am.BatteryStatsService;
		import com.android.server.connectivity.AutodestructReference;
		import com.android.server.connectivity.DataConnectionStats;
		import com.android.server.connectivity.DnsManager;
		import com.android.server.connectivity.DnsManager.PrivateDnsValidationUpdate;
		@@ -2761,29 +2762,31 @@ public class ConnectivityService extends IConnectivityManager.Stub
		}

		private class NetworkMonitorCallbacks extends INetworkMonitorCallbacks.Stub {
		private final NetworkAgentInfo mNai;
		private final int mNetId;
		private final AutodestructReference<NetworkAgentInfo> mNai;

		private NetworkMonitorCallbacks(NetworkAgentInfo nai) {
		mNai = nai;
		mNetId = nai.network.netId;
		mNai = new AutodestructReference(nai);
		}

		@Override
		public void onNetworkMonitorCreated(INetworkMonitor networkMonitor) {
		mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_AGENT,
		new Pair<>(mNai, networkMonitor)));
		new Pair<>(mNai.getAndDestroy(), networkMonitor)));
		}

		@Override
		public void notifyNetworkTested(int testResult, @Nullable String redirectUrl) {
		mTrackerHandler.sendMessage(mTrackerHandler.obtainMessage(EVENT_NETWORK_TESTED,
		testResult, mNai.network.netId, redirectUrl));
		testResult, mNetId, redirectUrl));
		}

		@Override
		public void notifyPrivateDnsConfigResolved(PrivateDnsConfigParcel config) {
		mTrackerHandler.sendMessage(mTrackerHandler.obtainMessage(
		EVENT_PRIVATE_DNS_CONFIG_RESOLVED,
		0, mNai.network.netId, PrivateDnsConfig.fromParcel(config)));
		0, mNetId, PrivateDnsConfig.fromParcel(config)));
		}

		@Override
		@@ -2801,15 +2804,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
		}
		mTrackerHandler.sendMessage(mTrackerHandler.obtainMessage(
		EVENT_PROVISIONING_NOTIFICATION, PROVISIONING_NOTIFICATION_SHOW,
		mNai.network.netId,
		pendingIntent));
		mNetId, pendingIntent));
		}

		@Override
		public void hideProvisioningNotification() {
		mTrackerHandler.sendMessage(mTrackerHandler.obtainMessage(
		EVENT_PROVISIONING_NOTIFICATION, PROVISIONING_NOTIFICATION_HIDE,
		mNai.network.netId));
		EVENT_PROVISIONING_NOTIFICATION, PROVISIONING_NOTIFICATION_HIDE, mNetId));
		}

		@Override

services/core/java/com/android/server/connectivity/AutodestructReference.java

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.server.connectivity;

		import android.annotation.NonNull;

		import java.util.concurrent.atomic.AtomicReference;

		/**
		* A ref that autodestructs at the first usage of it.
		* @param <T> The type of the held object
		* @hide
		*/
		public class AutodestructReference<T> {
		private final AtomicReference<T> mHeld;
		public AutodestructReference(@NonNull T obj) {
		if (null == obj) throw new NullPointerException("Autodestruct reference to null");
		mHeld = new AtomicReference<>(obj);
		}

		/** Get the ref and destruct it. NPE if already destructed. */
		@NonNull
		public T getAndDestroy() {
		final T obj = mHeld.getAndSet(null);
		if (null == obj) throw new NullPointerException("Already autodestructed");
		return obj;
		}
		}