commit 5008e92d1fd573d926cd55c39ca723a6fbdf7c4b
author Wink Saville <wink@google.com> Fri Apr 08 10:44:43 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 08 10:44:43 2011 -0700
tree dbc278168834b40117cdec64ad8cf605ee32be83
parent ceb889711ff182aa0635f0776fdeeb7185f3a105
parent b93811091d8e412d1247ee1f4506b7db1439235d

am b9381109: am 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE

* commit 'b93811091d8e412d1247ee1f4506b7db1439235d':
  DataConnection: set CID to the correct value.

telephony/java/com/android/internal/telephony/DataConnection.java

diff --git a/telephony/java/com/android/internal/telephony/DataConnection.java b/telephony/java/com/android/internal/telephony/DataConnection.java
index 0ad5296..0c47e86 100644
--- a/telephony/java/com/android/internal/telephony/DataConnection.java
+++ b/telephony/java/com/android/internal/telephony/DataConnection.java
@@ -466,6 +466,7 @@
 
             // Check if system property dns usable
             boolean okToUseSystemPropertyDns = false;
+            cid = response.cid;
             String propertyPrefix = "net." + response.ifname + ".";
             String dnsServers[] = new String[2];
             dnsServers[0] = SystemProperties.get(propertyPrefix + "dns1");