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

Commit d8bfd70c authored Feb 26, 2021 by Brad Ebinger Committed by Automerger Merge Worker Feb 26, 2021

Merge "Move illegal state detection in stub classes to warning" into sc-dev am: 24eadb70

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75bff57d5e4b21c3ea1843e32409576331feb476

parents a89bb7f7 24eadb70

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);
		}
		}