commit bd403df49693fe08267a90c8abf0396dfab2c4bf
author Tyler Gunn <tgunn@google.com> Tue Jan 12 18:59:38 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 12 18:59:38 2016 +0000
tree 82a56b1a0d7c59f5ea8bb6cbad551cf2b49e007f
parent f66042ce9e054f41f0e6f8f4ebaf06c508e79106
parent 40e3e15bfd239919bbacd94fb9927fb1269f60c5

Merge "Fix potential ClassCastException." into mnc-dr1.5-dev am: 0829e9228a
am: 40e3e15bfd

* commit '40e3e15bfd239919bbacd94fb9927fb1269f60c5':
  Fix potential ClassCastException.

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 5f64f6d..9e035b5 100644
--- a/src/com/android/services/telephony/PstnIncomingCallNotifier.java
+++ b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
@@ -269,10 +269,12 @@
                 if (service != null) {
                     for (android.telecom.Connection telephonyConnection : service
                             .getAllConnections()) {
-                        if (maybeSwapWithUnknownConnection(
-                                (TelephonyConnection) telephonyConnection,
-                                unknown)) {
-                            return true;
+                        if (telephonyConnection instanceof TelephonyConnection) {
+                            if (maybeSwapWithUnknownConnection(
+                                    (TelephonyConnection) telephonyConnection,
+                                    unknown)) {
+                                return true;
+                            }
                         }
                     }
                 }