From f9cb86aebe9647e0fe0137fc198ba16c017445c6 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Tue, 8 Apr 2014 17:34:00 -0700 Subject: Replace LinkCapabilities with NetworkCapabilities Also remove unused LinkSocket and LinkSocketNotifier. bug:13885501 Change-Id: Id426e31b201fa4f29109b5fea485d8efb34519d3 --- telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl | 4 ++-- telephony/java/com/android/internal/telephony/PhoneConstants.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'telephony') 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"; -- cgit v1.1