Merge "Add missing null checks on Conference and Connection." into nyc-dev (53befa2e) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/Conference.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -694,7 +694,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);
		}
		}
		@@ -710,8 +710,10 @@ public abstract class Conference extends Conferenceable {
		mPreviousExtraKeys = new ArraySet<String>();
		}
		mPreviousExtraKeys.clear();
		if (extras != null) {
		mPreviousExtraKeys.addAll(extras.keySet());
		}
		}

		/**
		* Adds some extras to this {@link Conference}. Existing keys are replaced and new ones are

+5 −3

Original line number	Diff line number	Diff line
		@@ -1887,7 +1887,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);
		}
		}
		@@ -1902,8 +1902,10 @@ public abstract class Connection extends Conferenceable {
		mPreviousExtraKeys = new ArraySet<String>();
		}
		mPreviousExtraKeys.clear();
		if (extras != null) {
		mPreviousExtraKeys.addAll(extras.keySet());
		}
		}

		/**
		* Adds some extras to this {@code Connection}. Existing keys are replaced and new ones are
		@@ -2317,7 +2319,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);
		}
		}
		}