Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add bit to eventlog to handle new network types

Browse Source 
bug:5514930
Change-Id: I29288cb39902578992ee53b171f228f8eeb407fd
This commit is contained in:
Robert Greenwalt
2012-04-25 13:45:02 -07:00
parent 7725180c64
commit 3bc9a79fe8
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

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

@@ -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)