drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Increase readability of connectivity event log." into jb-mr1.1-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2012-11-12 10:28:33 -08:00
committed by Android (Google) Code Review
parent f6f47e950d 2528b50b91
commit bc0edecb73
2 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/java/com/android/server/ConnectivityService.java
View File

@ -2686,18 +2686,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
state + "/" + info.getDetailedState()); state + "/" + info.getDetailedState());
} }
// Connectivity state changed: EventLogTags.writeConnectivityStateChanged(
// [31-14] Reserved for future use info.getType(), info.getSubtype(), info.getDetailedState().ordinal());
// [13-10] Network subtype (for mobile network, as defined
// by TelephonyManager)
// [9-4] Detailed state ordinal (as defined by
// NetworkInfo.DetailedState)
// [3-0] Network type (as defined by ConnectivityManager)
int eventLogParam = (info.getType() & 0xf) |
((info.getDetailedState().ordinal() & 0x3f) << 4) |
(info.getSubtype() << 10);
EventLog.writeEvent(EventLogTags.CONNECTIVITY_STATE_CHANGED,
eventLogParam);
if (info.getDetailedState() == if (info.getDetailedState() ==
NetworkInfo.DetailedState.FAILED) { NetworkInfo.DetailedState.FAILED) {

8
services/java/com/android/server/EventLogTags.logtags
View File

@ -135,12 +135,8 @@ option java_package com.android.server
# --------------------------- # ---------------------------
# ConnectivityService.java # ConnectivityService.java
# --------------------------- # ---------------------------
# Connectivity state changed: # Connectivity state changed
# [31-14] Reserved for future use 50020 connectivity_state_changed (type|1),(subtype|1),(state|1)
# [13-10] Network subtype (for mobile network, as defined by TelephonyManager)
# [ 9- 4] Detailed state ordinal (as defined by NetworkInfo.DetailedState)
# [ 3- 0] Network type (as defined by ConnectivityManager)
50020 connectivity_state_changed (custom|1|5)
# --------------------------- # ---------------------------