| commit | 44e019140ec4293ed53a91c459b8becc11f1d0fc | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Tue Jan 31 10:49:05 2017 -0800 |
| committer | Tyler Gunn <tgunn@google.com> | Mon Feb 06 16:20:12 2017 +0000 |
| tree | 356e3a2bc07281757811cbb4fd089bfd4be11261 | |
| parent | 161ac8b0064b4084dae7576b62897906ae4357b4 [diff] [blame] |
Self managed CS implementation. Add required AIDL changes to pass along connection fails. Test: Manual Bug: 34159263 Merged-In: I0a24ff786b2867aa4e19ac79959df54a04983251 Change-Id: I0a24ff786b2867aa4e19ac79959df54a04983251
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index ba7b6a1..96070b8 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -1517,6 +1517,10 @@ * otherwise. */ public boolean isIncomingCallPermitted(PhoneAccountHandle phoneAccountHandle) { + if (phoneAccountHandle == null) { + return false; + } + ITelecomService service = getTelecomService(); if (service != null) { try {