Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af627d2b authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Add missing null checks on Conference and Connection." into nyc-dev 

am: 53befa2e

* commit '53befa2e':
  Add missing null checks on Conference and Connection.

Change-Id: I2d39b84b0963ab2c8b92fb4604cc848f40b44e4a
parents 7f9ee1cd 53befa2e

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

telecomm/java/android/telecom/Connection.java

+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);

        }

    }

}