Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tyler Gunn
2016-03-29 19:02:07 +00:00
committed by Android (Google) Code Review
parent 029a28b7d6 a8fb8aba7c
commit 53befa2e0b
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telecomm/java/android/telecom/Conference.java
View File

@@ -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,7 +710,9 @@ public abstract class Conference extends Conferenceable {
mPreviousExtraKeys = new ArraySet<String>();
}
mPreviousExtraKeys.clear();
mPreviousExtraKeys.addAll(extras.keySet());
if (extras != null) {
mPreviousExtraKeys.addAll(extras.keySet());
}
}
/**