Merge "Fix ClassCastException"

2012-01-25 13:45:02 -08:00
parent c97a552023 b2bf3350a2
commit 556f0dba10
1 changed files with 4 additions and 1 deletions
--- a/telephony/java/com/android/internal/telephony/DataConnection.java
+++ b/telephony/java/com/android/internal/telephony/DataConnection.java
@@ -328,8 +328,11 @@ public abstract class DataConnection extends StateMachine {
        String reason = null;

        if (dp.onCompletedMsg != null) {
+            // Get ApnContext, but only valid on GSM devices this is a string on CDMA devices.
            Message msg = dp.onCompletedMsg;
-            alreadySent = (ApnContext)msg.obj;
+            if (msg.obj instanceof ApnContext) {
+                alreadySent = (ApnContext)msg.obj;
+            }
            reason = dp.reason;
            if (VDBG) {
                log(String.format("msg=%s msg.obj=%s", msg.toString(),