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

Commit d3ffa270 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Log some signal condition diagnostics for now."

parents e0018cc7 60b3e9c1
Loading
Loading
Loading
Loading
+11 −1
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ public class NetworkController extends BroadcastReceiver {
    // debug
    // debug
    static final String TAG = "StatusBar.NetworkController";
    static final String TAG = "StatusBar.NetworkController";
    static final boolean DEBUG = false;
    static final boolean DEBUG = false;
    static final boolean CHATTY = true; // additional diagnostics, but not logspew


    // telephony
    // telephony
    boolean mHspaDataDistinguishable;
    boolean mHspaDataDistinguishable;
@@ -286,7 +287,7 @@ public class NetworkController extends BroadcastReceiver {


        @Override
        @Override
        public void onDataConnectionStateChanged(int state, int networkType) {
        public void onDataConnectionStateChanged(int state, int networkType) {
            if (DEBUG) {
            if (DEBUG || CHATTY) {
                Slog.d(TAG, "onDataConnectionStateChanged: state=" + state
                Slog.d(TAG, "onDataConnectionStateChanged: state=" + state
                        + " type=" + networkType);
                        + " type=" + networkType);
            }
            }
@@ -682,10 +683,19 @@ public class NetworkController extends BroadcastReceiver {
    // ===== Full or limited Internet connectivity ==================================
    // ===== Full or limited Internet connectivity ==================================


    private void updateConnectivity(Intent intent) {
    private void updateConnectivity(Intent intent) {
        if (CHATTY) {
            Slog.d(TAG, "updateConnectivity: intent=" + intent);
        }

        NetworkInfo info = (NetworkInfo)(intent.getParcelableExtra(
        NetworkInfo info = (NetworkInfo)(intent.getParcelableExtra(
                ConnectivityManager.EXTRA_NETWORK_INFO));
                ConnectivityManager.EXTRA_NETWORK_INFO));
        int connectionStatus = intent.getIntExtra(ConnectivityManager.EXTRA_INET_CONDITION, 0);
        int connectionStatus = intent.getIntExtra(ConnectivityManager.EXTRA_INET_CONDITION, 0);


        if (CHATTY) {
            Slog.d(TAG, "updateConnectivity: networkInfo=" + info);
            Slog.d(TAG, "updateConnectivity: connectionStatus=" + connectionStatus);
        }

        int inetCondition = (connectionStatus > INET_CONDITION_THRESHOLD ? 1 : 0);
        int inetCondition = (connectionStatus > INET_CONDITION_THRESHOLD ? 1 : 0);


        switch (info.getType()) {
        switch (info.getType()) {