Check that callbacks are not null before adding them.

Fix future NullPointerException by checking for null callbacks
when they are added.

Change-Id: Icadd10d8f647a28cfe45977e18072cea17ea8a88

1 files changed, 3 insertions, 0 deletions

diff --git a/baseLibrary/src/main/java/android/databinding/CallbackRegistry.java b/baseLibrary/src/main/java/android/databinding/CallbackRegistry.java
index 0cd7b430..322b2794 100644
--- a/baseLibrary/src/main/java/android/databinding/CallbackRegistry.java
+++ b/baseLibrary/src/main/java/android/databinding/CallbackRegistry.java
@@ -210,6 +210,9 @@ public class CallbackRegistry<C, T, A> implements Cloneable {
      * @param callback The callback to add.
      */
     public synchronized void add(C callback) {
+        if (callback == null) {
+            throw new IllegalArgumentException("callback cannot be null");
+        }
         int index = mCallbacks.lastIndexOf(callback);
         if (index < 0 || isRemoved(index)) {
             mCallbacks.add(callback);