Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6d119c2 authored Mar 03, 2021 by Brad Ebinger Committed by Automerger Merge Worker Mar 03, 2021

Merge "Move illegal state detection in stub classes to warning" am: 4d183b88 am: 98e4437b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08cda211285f6309569d4ab1b818e3e9d2a3236a

parents 29ad2f4b 98e4437b

telephony/java/android/telephony/ims/stub/ImsEcbmImplBase.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -57,10 +57,10 @@ public class ImsEcbmImplBase {
		} else if (listener != null && mListener == null) {
		mListener = listener;
		} else {
		// Fail fast here instead of silently overwriting the listener to another
		// listener due to another connection connecting.
		throw new IllegalStateException("ImsEcbmImplBase: Listener already set by "
		+ "another connection.");
		// Warn that the listener is being replaced while active
		Log.w(TAG, "setListener is being called when there is already an active "
		+ "listener");
		mListener = listener;
		}
		}
		}

telephony/java/android/telephony/ims/stub/ImsMultiEndpointImplBase.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -62,10 +62,10 @@ public class ImsMultiEndpointImplBase {
		} else if (listener != null && mListener == null) {
		mListener = listener;
		} else {
		// Fail fast here instead of silently overwriting the listener to another
		// listener due to another connection connecting.
		throw new IllegalStateException("ImsMultiEndpointImplBase: Listener already"
		+ " set by another connection.");
		// Warn that the listener is being replaced while active
		Log.w(TAG, "setListener is being called when there is already an active "
		+ "listener");
		mListener = listener;
		}
		}
		}

telephony/java/android/telephony/ims/stub/ImsUtImplBase.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -224,11 +224,10 @@ public class ImsUtImplBase {
		} else if (listener != null && mUtListener == null) {
		mUtListener = new ImsUtListener(listener);
		} else {
		// This is a limitation of the current API surface, there can only be one
		// listener connected. Fail fast instead of silently overwriting the other
		// listener.
		throw new IllegalStateException("ImsUtImplBase#setListener: listener already "
		+ "set by another connected interface!");
		// Warn that the listener is being replaced while active
		Log.w(TAG, "setListener is being called when there is already an active "
		+ "listener");
		mUtListener = new ImsUtListener(listener);
		}
		}