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

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

Browse Source 
* commit '20fab81a09e1ca04e811c6c6d94acb08037739e7':
  Fix crash when doing conferencing over Wi-Fi
This commit is contained in:
Sailesh Nepal
2015-06-22 18:47:24 +00:00
committed by Android Git Automerger
parent dee3ddfa5a 20fab81a09
commit 849dfc35bc
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);
} }