Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75bff57d5e4b21c3ea1843e32409576331feb476
This commit is contained in:
Brad Ebinger
2021-02-26 02:06:57 +00:00
committed by Automerger Merge Worker
parent a89bb7f7ee 24eadb70ce
commit d8bfd70c1a
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/android/telephony/ims/stub/ImsEcbmImplBase.java
View File

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

8
telephony/java/android/telephony/ims/stub/ImsMultiEndpointImplBase.java
View File

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

9
telephony/java/android/telephony/ims/stub/ImsUtImplBase.java
View File

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