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

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

Browse Source 
* commit '849dfc35bcad75119516d786c20d3df74eb946bf':
  Fix crash when doing conferencing over Wi-Fi
This commit is contained in:
Sailesh Nepal
2015-06-22 18:53:40 +00:00
committed by Android Git Automerger
parent 8e7012a84d 849dfc35bc
commit de7b60a19b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telecomm/java/android/telecom/Connection.java
View File

@@ -1067,6 +1067,9 @@ public abstract class Connection extends Conferenceable {
@SystemApi @SystemApi
@Deprecated @Deprecated
public final AudioState getAudioState() { public final AudioState getAudioState() {
if (mCallAudioState == null) {
return null;
}
return new AudioState(mCallAudioState); return new AudioState(mCallAudioState);
} }