commit 7daffe5689c15c7d7a3a0a302a8fa4d8ccd76aae
author Yorke Lee <yorkelee@google.com> Fri Oct 10 16:16:12 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 10 16:16:13 2014 +0000
tree aa062f5241a3088110fae547f4210609aa48d4c7
parent b85e561188120df65a5fa4e5963646a6c56dde5d
parent fac053aeb7e30a964d683812b4f2bc6c37e1a038

Merge "Protect against ClassCastException in PstnIncomingCallNotifier" into lmp-dev

src/com/android/services/telephony/PstnIncomingCallNotifier.java

diff --git a/src/com/android/services/telephony/PstnIncomingCallNotifier.java b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
index 654150c..f4c8a22 100644
--- a/src/com/android/services/telephony/PstnIncomingCallNotifier.java
+++ b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
@@ -197,6 +197,10 @@
 
     private void handleNewUnknownConnection(AsyncResult asyncResult) {
         Log.i(this, "handleNewUnknownConnection");
+        if (!(asyncResult.result instanceof Connection)) {
+            Log.w(this, "handleNewUnknownConnection called with non-Connection object");
+            return;
+        }
         Connection connection = (Connection) asyncResult.result;
         if (connection != null) {
             Call call = connection.getCall();