Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c1de863 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Add bit to eventlog to handle new network types" into jb-dev

parents 1b8f499a 3bc9a79f

services/java/com/android/server/ConnectivityService.java

+7 −7
Original line number Diff line number Diff line
@@ -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);

services/java/com/android/server/EventLogTags.logtags

+4 −4
Original line number Diff line number Diff line
@@ -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)