diff options
| -rw-r--r-- | telecomm/java/android/telecom/Conference.java | 6 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index 00e07afda4b1..f5c4eb100224 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -665,7 +665,7 @@ public abstract class Conference extends Conferenceable { if (mPreviousExtraKeys != null) { List<String> toRemove = new ArrayList<String>(); for (String oldKey : mPreviousExtraKeys) { - if (!extras.containsKey(oldKey)) { + if (extras == null || !extras.containsKey(oldKey)) { toRemove.add(oldKey); } } @@ -681,7 +681,9 @@ public abstract class Conference extends Conferenceable { mPreviousExtraKeys = new ArraySet<String>(); } mPreviousExtraKeys.clear(); - mPreviousExtraKeys.addAll(extras.keySet()); + if (extras != null) { + mPreviousExtraKeys.addAll(extras.keySet()); + } } /** diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 3ea1c6a7663b..d864833aa2b4 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -1821,7 +1821,7 @@ public abstract class Connection extends Conferenceable { if (mPreviousExtraKeys != null) { List<String> toRemove = new ArrayList<String>(); for (String oldKey : mPreviousExtraKeys) { - if (!extras.containsKey(oldKey)) { + if (extras == null || !extras.containsKey(oldKey)) { toRemove.add(oldKey); } } @@ -1836,7 +1836,9 @@ public abstract class Connection extends Conferenceable { mPreviousExtraKeys = new ArraySet<String>(); } mPreviousExtraKeys.clear(); - mPreviousExtraKeys.addAll(extras.keySet()); + if (extras != null) { + mPreviousExtraKeys.addAll(extras.keySet()); + } } /** @@ -2251,7 +2253,7 @@ public abstract class Connection extends Conferenceable { */ public void sendConnectionEvent(String event, Bundle extras) { for (Listener l : mListeners) { - l.onConnectionEvent(this, event, null); + l.onConnectionEvent(this, event, extras); } } } |