diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-09-09 16:14:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-09 16:14:57 +0000 |
| commit | 4f14347f9149b8827d344770307bdf442cd2ff0d (patch) | |
| tree | bf8f02c7964aad35a64f289c1c5052681b0b6bfb /src | |
| parent | 8ca52ff89d9f43cf1ff04d1d607a0b904e749a82 (diff) | |
| parent | 9e3452a8efa430f9ca04379be3da6baf0bb0f51a (diff) | |
| download | android_frameworks_opt_net_ims-4f14347f9149b8827d344770307bdf442cd2ff0d.tar.gz android_frameworks_opt_net_ims-4f14347f9149b8827d344770307bdf442cd2ff0d.tar.bz2 android_frameworks_opt_net_ims-4f14347f9149b8827d344770307bdf442cd2ff0d.zip | |
Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into mnc-dr-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/java/com/android/ims/ImsCall.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java index afbb196..a4583ba 100644 --- a/src/java/com/android/ims/ImsCall.java +++ b/src/java/com/android/ims/ImsCall.java @@ -1582,6 +1582,10 @@ public class ImsCall implements ICall { } private void notifyConferenceStateUpdated(ImsConferenceState state) { + if (state == null || state.mParticipants == null) { + return; + } + Set<Entry<String, Bundle>> participants = state.mParticipants.entrySet(); if (participants == null) { |