diff options
author | Sailesh Nepal <sail@google.com> | 2015-06-21 10:25:13 -0700 |
---|---|---|
committer | Sailesh Nepal <sail@google.com> | 2015-06-21 10:25:13 -0700 |
commit | 000d38ab3ce46ad9ba4d99694c4d1bf46dff9cbf (patch) | |
tree | c9020c6f1a8579af60744168a86d5945ba5b428a /telecomm | |
parent | 3ac465a7d830a973096b4f69ef4531f09dcdf07c (diff) | |
download | frameworks_base-000d38ab3ce46ad9ba4d99694c4d1bf46dff9cbf.zip frameworks_base-000d38ab3ce46ad9ba4d99694c4d1bf46dff9cbf.tar.gz frameworks_base-000d38ab3ce46ad9ba4d99694c4d1bf46dff9cbf.tar.bz2 |
Fix crash when doing conferencing over Wi-Fi
The problem was that we were calling Connection.getAudioState
in the conferencing code. This led to a null pointer exception.
Fix was to add a null pointer check.
BUG: 21957102
Change-Id: Ibad0f6cc70a5bc4a30023beb857125802bc35cd4
Diffstat (limited to 'telecomm')
-rw-r--r-- | telecomm/java/android/telecom/Connection.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 91566f8..6055211 100644 --- 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); } |