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"

Browse Source
This commit is contained in:
Brad Ebinger
2021-03-03 17:45:49 +00:00
committed by Gerrit Code Review
parent 1258b5fec3 ded80f3e33
commit 4d183b882d
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) { } else if (listener != null && mListener == null) {
mListener = listener; mListener = listener;
} else { } else {
// Fail fast here instead of silently overwriting the listener to another // Warn that the listener is being replaced while active
// listener due to another connection connecting. Log.w(TAG, "setListener is being called when there is already an active "
throw new IllegalStateException("ImsEcbmImplBase: Listener already set by " + "listener");
+ "another connection."); 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) { } else if (listener != null && mListener == null) {
mListener = listener; mListener = listener;
} else { } else {
// Fail fast here instead of silently overwriting the listener to another // Warn that the listener is being replaced while active
// listener due to another connection connecting. Log.w(TAG, "setListener is being called when there is already an active "
throw new IllegalStateException("ImsMultiEndpointImplBase: Listener already" + "listener");
+ " set by another connection."); 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) { } else if (listener != null && mUtListener == null) {
mUtListener = new ImsUtListener(listener); mUtListener = new ImsUtListener(listener);
} else { } else {
// This is a limitation of the current API surface, there can only be one // Warn that the listener is being replaced while active
// listener connected. Fail fast instead of silently overwriting the other Log.w(TAG, "setListener is being called when there is already an active "
// listener. + "listener");
throw new IllegalStateException("ImsUtImplBase#setListener: listener already " mUtListener = new ImsUtListener(listener);
+ "set by another connected interface!");
} }
} }