am 20fab81a: Merge "Fix crash when doing conferencing over Wi-Fi" into mnc-dev

* commit '20fab81a09e1ca04e811c6c6d94acb08037739e7': Fix crash when doing conferencing over Wi-Fi
2015-06-22 18:47:24 +00:00
parent dee3ddfa5a 20fab81a09
commit 849dfc35bc
1 changed files with 3 additions and 0 deletions
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -1067,6 +1067,9 @@ public abstract class Connection extends Conferenceable {
    @SystemApi
    @Deprecated
    public final AudioState getAudioState() {
+        if (mCallAudioState == null) {
+          return null;
+        }
        return new AudioState(mCallAudioState);
    }