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

* commit '849dfc35bcad75119516d786c20d3df74eb946bf': Fix crash when doing conferencing over Wi-Fi
2015-06-22 18:53:40 +00:00
parent 8e7012a84d 849dfc35bc
commit de7b60a19b
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);
    }