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

Commit bc0edecb authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

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

parents f6f47e95 2528b50b

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

+2 −12
Original line number Diff line number Diff line
@@ -2686,18 +2686,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                            state + "/" + info.getDetailedState());

                    }



                    // Connectivity state changed:

                    // [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)

                    int eventLogParam = (info.getType() & 0xf) |

                            ((info.getDetailedState().ordinal() & 0x3f) << 4) |

                            (info.getSubtype() << 10);

                    EventLog.writeEvent(EventLogTags.CONNECTIVITY_STATE_CHANGED,

                            eventLogParam);

                    EventLogTags.writeConnectivityStateChanged(

                            info.getType(), info.getSubtype(), info.getDetailedState().ordinal());



                    if (info.getDetailedState() ==

                            NetworkInfo.DetailedState.FAILED) {

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

+2 −6
Original line number Diff line number Diff line
@@ -135,12 +135,8 @@ option java_package com.android.server 
# ---------------------------

# ConnectivityService.java

# ---------------------------

# Connectivity state changed:

# [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)

# Connectivity state changed

50020 connectivity_state_changed (type|1),(subtype|1),(state|1)





# ---------------------------