diff options
| author | Wink Saville <wink@google.com> | 2012-01-25 13:45:02 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-25 13:45:02 -0800 |
| commit | 556f0dba10517c76b6f20e95e3f4510c0cfb5911 (patch) | |
| tree | aa7d61423cd2296a11bd23dfae493d26b59abee0 | |
| parent | c97a552023c3c71079b39092e80c9b44f25a789b (diff) | |
| parent | b2bf3350a2c83b1eba43ae85ed1aa5bc59a59897 (diff) | |
| download | frameworks_base-556f0dba10517c76b6f20e95e3f4510c0cfb5911.zip frameworks_base-556f0dba10517c76b6f20e95e3f4510c0cfb5911.tar.gz frameworks_base-556f0dba10517c76b6f20e95e3f4510c0cfb5911.tar.bz2 | |
Merge "Fix ClassCastException"
| -rw-r--r-- | telephony/java/com/android/internal/telephony/DataConnection.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/DataConnection.java b/telephony/java/com/android/internal/telephony/DataConnection.java index 1336818..d0e304f 100644 --- 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(), |