diff options
| author | Wink Saville <wink@google.com> | 2011-04-08 10:44:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-08 10:44:43 -0700 |
| commit | 5008e92d1fd573d926cd55c39ca723a6fbdf7c4b (patch) | |
| tree | dbc278168834b40117cdec64ad8cf605ee32be83 | |
| parent | ceb889711ff182aa0635f0776fdeeb7185f3a105 (diff) | |
| parent | b93811091d8e412d1247ee1f4506b7db1439235d (diff) | |
| download | frameworks_base-5008e92d1fd573d926cd55c39ca723a6fbdf7c4b.zip frameworks_base-5008e92d1fd573d926cd55c39ca723a6fbdf7c4b.tar.gz frameworks_base-5008e92d1fd573d926cd55c39ca723a6fbdf7c4b.tar.bz2 | |
am b9381109: am 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE
* commit 'b93811091d8e412d1247ee1f4506b7db1439235d':
DataConnection: set CID to the correct value.
| -rw-r--r-- | telephony/java/com/android/internal/telephony/DataConnection.java | 1 |
1 files changed, 1 insertions, 0 deletions
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 @@ public abstract class DataConnection extends HierarchicalStateMachine { // 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"); |