diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2014-04-08 17:34:00 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2014-05-12 16:52:56 -0700 |
| commit | f9cb86aebe9647e0fe0137fc198ba16c017445c6 (patch) | |
| tree | 5f7d1e0ab2f48cb39092881266f21f7e11ea33b3 /telephony | |
| parent | 6681e32fff77174b1b93557c08d1fd00375422c0 (diff) | |
| download | frameworks_base-f9cb86aebe9647e0fe0137fc198ba16c017445c6.zip frameworks_base-f9cb86aebe9647e0fe0137fc198ba16c017445c6.tar.gz frameworks_base-f9cb86aebe9647e0fe0137fc198ba16c017445c6.tar.bz2 | |
Replace LinkCapabilities with NetworkCapabilities
Also remove unused LinkSocket and LinkSocketNotifier.
bug:13885501
Change-Id: Id426e31b201fa4f29109b5fea485d8efb34519d3
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl | 4 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/PhoneConstants.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl index 8ea9b0d..b104c11 100644 --- a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl @@ -18,7 +18,7 @@ package com.android.internal.telephony; import android.content.Intent; import android.net.LinkProperties; -import android.net.LinkCapabilities; +import android.net.NetworkCapabilities; import android.os.Bundle; import android.telephony.CellInfo; import android.telephony.DataConnectionRealTimeInfo; @@ -37,7 +37,7 @@ interface ITelephonyRegistry { void notifyDataActivity(int state); void notifyDataConnection(int state, boolean isDataConnectivityPossible, String reason, String apn, String apnType, in LinkProperties linkProperties, - in LinkCapabilities linkCapabilities, int networkType, boolean roaming); + in NetworkCapabilities networkCapabilities, int networkType, boolean roaming); void notifyDataConnectionFailed(String reason, String apnType); void notifyCellLocation(in Bundle cellLocation); void notifyOtaspChanged(in int otaspMode); diff --git a/telephony/java/com/android/internal/telephony/PhoneConstants.java b/telephony/java/com/android/internal/telephony/PhoneConstants.java index 8c42d25..6ad57cf 100644 --- a/telephony/java/com/android/internal/telephony/PhoneConstants.java +++ b/telephony/java/com/android/internal/telephony/PhoneConstants.java @@ -78,7 +78,7 @@ public class PhoneConstants { public static final String DATA_APN_TYPE_KEY = "apnType"; public static final String DATA_APN_KEY = "apn"; public static final String DATA_LINK_PROPERTIES_KEY = "linkProperties"; - public static final String DATA_LINK_CAPABILITIES_KEY = "linkCapabilities"; + public static final String DATA_NETWORK_CAPABILITIES_KEY = "networkCapabilities"; public static final String DATA_IFACE_NAME_KEY = "iface"; public static final String NETWORK_UNAVAILABLE_KEY = "networkUnvailable"; |