Merge "Calling linkToDeath on binder in NRI constructor" (6269d2eb) · Commits · e / os / android_frameworks_base

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

+13 −7

Original line number	Diff line number	Diff line
		@@ -5542,12 +5542,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
		incrementRequestCountOrThrow(this);
		mCallbackFlags = callbackFlags;
		mCallingAttributionTag = callingAttributionTag;

		try {
		mBinder.linkToDeath(this, 0);
		} catch (RemoteException e) {
		binderDied();
		}
		linkDeathRecipient();
		}

		NetworkRequestInfo(@NonNull final NetworkRequestInfo nri,
		@@ -5585,6 +5580,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
		incrementRequestCountOrThrow(this);
		mCallbackFlags = nri.mCallbackFlags;
		mCallingAttributionTag = nri.mCallingAttributionTag;
		linkDeathRecipient();
		}

		NetworkRequestInfo(int asUid, @NonNull final NetworkRequest r) {
		@@ -5613,8 +5609,18 @@ public class ConnectivityService extends IConnectivityManager.Stub
		return Collections.unmodifiableList(tempRequests);
		}

		void linkDeathRecipient() {
		if (null != mBinder) {
		try {
		mBinder.linkToDeath(this, 0);
		} catch (RemoteException e) {
		binderDied();
		}
		}
		}

		void unlinkDeathRecipient() {
		if (mBinder != null) {
		if (null != mBinder) {
		mBinder.unlinkToDeath(this, 0);
		}
		}