summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/TelephonyRegistry.java
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-10-21 07:39:10 -0700
committerBrad Fitzpatrick <bradfitz@android.com>2010-10-21 07:39:10 -0700
commit385a753dead6ef15f2e30eae47f73e642b3ef7ed (patch)
treeae4e55f4c7903e62f23802c7d49ad97ae5b2f0a7 /services/java/com/android/server/TelephonyRegistry.java
parenta376d030a2075909219926d622b71016418d7dcd (diff)
parent368fdba47a49f249aa4346edaf3f45291ca6a7ff (diff)
downloadframeworks_base-385a753dead6ef15f2e30eae47f73e642b3ef7ed.zip
frameworks_base-385a753dead6ef15f2e30eae47f73e642b3ef7ed.tar.gz
frameworks_base-385a753dead6ef15f2e30eae47f73e642b3ef7ed.tar.bz2
resolved conflicts for merge of 368fdba4 to master
Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
Diffstat (limited to 'services/java/com/android/server/TelephonyRegistry.java')
-rw-r--r--services/java/com/android/server/TelephonyRegistry.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/java/com/android/server/TelephonyRegistry.java b/services/java/com/android/server/TelephonyRegistry.java
index 2b4845b..b3242d7 100644
--- a/services/java/com/android/server/TelephonyRegistry.java
+++ b/services/java/com/android/server/TelephonyRegistry.java
@@ -260,6 +260,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
if (!checkNotifyPermission("notifyServiceState()")){
return;
}
+ Slog.i(TAG, "notifyServiceState: " + state);
synchronized (mRecords) {
mServiceState = state;
for (Record r : mRecords) {
@@ -363,6 +364,9 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
if (!checkNotifyPermission("notifyDataConnection()" )) {
return;
}
+ Slog.i(TAG, "notifyDataConnection: state=" + state + " isDataConnectivityPossible="
+ + isDataConnectivityPossible + " reason=" + reason
+ + " interfaceName=" + interfaceName + " networkType=" + networkType);
synchronized (mRecords) {
boolean modified = false;
if (state == TelephonyManager.DATA_CONNECTED) {