diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2012-04-25 15:12:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-25 15:12:03 -0700 |
| commit | 2c1de863c339f9b9a965d96dcb646bb31ff5207f (patch) | |
| tree | 63f0ab3de5b17d54988f960832ce4bd745951758 | |
| parent | 1b8f499a14a4340d3422d95c7f6fdc8c0c72b3a4 (diff) | |
| parent | 3bc9a79fe83d19d4701bd6035fd30d83f267906e (diff) | |
| download | frameworks_base-2c1de863c339f9b9a965d96dcb646bb31ff5207f.zip frameworks_base-2c1de863c339f9b9a965d96dcb646bb31ff5207f.tar.gz frameworks_base-2c1de863c339f9b9a965d96dcb646bb31ff5207f.tar.bz2 | |
Merge "Add bit to eventlog to handle new network types" into jb-dev
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 14 | ||||
| -rw-r--r-- | services/java/com/android/server/EventLogTags.logtags | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index faa8d3c..dd650bf 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -2422,15 +2422,15 @@ private NetworkStateTracker makeWimaxStateTracker() { } // Connectivity state changed: - // [31-13] Reserved for future use - // [12-9] Network subtype (for mobile network, as defined + // [31-14] Reserved for future use + // [13-10] Network subtype (for mobile network, as defined // by TelephonyManager) - // [8-3] Detailed state ordinal (as defined by + // [9-4] Detailed state ordinal (as defined by // NetworkInfo.DetailedState) - // [2-0] Network type (as defined by ConnectivityManager) - int eventLogParam = (info.getType() & 0x7) | - ((info.getDetailedState().ordinal() & 0x3f) << 3) | - (info.getSubtype() << 9); + // [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); diff --git a/services/java/com/android/server/EventLogTags.logtags b/services/java/com/android/server/EventLogTags.logtags index 249513f..41f7335 100644 --- a/services/java/com/android/server/EventLogTags.logtags +++ b/services/java/com/android/server/EventLogTags.logtags @@ -134,10 +134,10 @@ option java_package com.android.server # ConnectivityService.java # --------------------------- # Connectivity state changed: -# [31-13] Reserved for future use -# [12- 9] Network subtype (for mobile network, as defined by TelephonyManager) -# [ 8- 3] Detailed state ordinal (as defined by NetworkInfo.DetailedState) -# [ 2- 0] Network type (as defined by ConnectivityManager) +# [31-14] Reserved for future use +# [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) |