summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2010-10-21 11:38:11 -0400
committerJoe Onorato <joeo@google.com>2010-10-21 11:38:25 -0400
commit749984798c64de1594ceb123d419711eed6e90a2 (patch)
tree964515574493ada5ab695902e3ea75f317c8c01e /services
parent385a753dead6ef15f2e30eae47f73e642b3ef7ed (diff)
downloadframeworks_base-749984798c64de1594ceb123d419711eed6e90a2.zip
frameworks_base-749984798c64de1594ceb123d419711eed6e90a2.tar.gz
frameworks_base-749984798c64de1594ceb123d419711eed6e90a2.tar.bz2
fix bad merge
Change-Id: I44b9265a7ef3accc5c794d2ef9308b050c961a81
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/TelephonyRegistry.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/TelephonyRegistry.java b/services/java/com/android/server/TelephonyRegistry.java
index b3242d7..63515eb 100644
--- a/services/java/com/android/server/TelephonyRegistry.java
+++ b/services/java/com/android/server/TelephonyRegistry.java
@@ -366,7 +366,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
}
Slog.i(TAG, "notifyDataConnection: state=" + state + " isDataConnectivityPossible="
+ isDataConnectivityPossible + " reason=" + reason
- + " interfaceName=" + interfaceName + " networkType=" + networkType);
+ + " apn=" + apn + " networkType=" + networkType);
synchronized (mRecords) {
boolean modified = false;
if (state == TelephonyManager.DATA_CONNECTED) {