diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-07-15 10:52:54 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-07-15 10:52:54 -0700 |
| commit | d9212d3088d2ecb794933c2f96392ea160b857eb (patch) | |
| tree | 38b7e6e8bbfa0731ad85c471310dec99d9f8a474 /telephony | |
| parent | 23399b7048cad213e9fa5b7e40ac7dfb38e0824d (diff) | |
| parent | 8550f3b86aabe04e149866839bde78b335cc1104 (diff) | |
| download | frameworks_base-d9212d3088d2ecb794933c2f96392ea160b857eb.zip frameworks_base-d9212d3088d2ecb794933c2f96392ea160b857eb.tar.gz frameworks_base-d9212d3088d2ecb794933c2f96392ea160b857eb.tar.bz2 | |
resolved conflicts for merge of 8550f3b8 to master
Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81
Diffstat (limited to 'telephony')
3 files changed, 2 insertions, 4 deletions
diff --git a/telephony/java/com/android/internal/telephony/DataConnection.java b/telephony/java/com/android/internal/telephony/DataConnection.java index 1bba8e3..8978f1d 100644 --- a/telephony/java/com/android/internal/telephony/DataConnection.java +++ b/telephony/java/com/android/internal/telephony/DataConnection.java @@ -26,7 +26,6 @@ import com.android.internal.util.StateMachine; import android.app.PendingIntent; import android.net.LinkCapabilities; import android.net.LinkProperties; -import android.net.LinkProperties.CompareAddressesResult; import android.net.ProxyProperties; import android.os.AsyncResult; import android.os.Message; diff --git a/telephony/java/com/android/internal/telephony/DataConnectionAc.java b/telephony/java/com/android/internal/telephony/DataConnectionAc.java index 9e185e5..a9f2cd1 100644 --- a/telephony/java/com/android/internal/telephony/DataConnectionAc.java +++ b/telephony/java/com/android/internal/telephony/DataConnectionAc.java @@ -23,7 +23,6 @@ import com.android.internal.util.Protocol; import android.app.PendingIntent; import android.net.LinkCapabilities; import android.net.LinkProperties; -import android.net.LinkProperties.CompareAddressesResult; import android.net.ProxyProperties; import android.os.Message; diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index bf964b7..ccdb0bf 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -27,7 +27,7 @@ import android.database.ContentObserver; import android.database.Cursor; import android.net.ConnectivityManager; import android.net.LinkAddress; -import android.net.LinkProperties.CompareAddressesResult; +import android.net.LinkProperties.CompareResult; import android.net.NetworkUtils; import android.net.ProxyProperties; import android.net.TrafficStats; @@ -1152,7 +1152,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { ! result.oldLp.isIdenticalHttpProxy(result.newLp) || ! result.oldLp.isIdenticalAddresses(result.newLp)) { // If the same address type was removed and added we need to cleanup - CompareAddressesResult car = + CompareResult<LinkAddress> car = result.oldLp.compareAddresses(result.newLp); boolean needToClean = false; for (LinkAddress added : car.added) { |