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

Commit cc985804 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 1800ccfa: am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1 

* commit '1800ccfa':
  Disable wimax when mobile data is in Settings
parents 140d0158 1800ccfa

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

+6 −0
Original line number Diff line number Diff line
@@ -1431,6 +1431,12 @@ private NetworkStateTracker makeWimaxStateTracker() { 
            }

            mNetTrackers[ConnectivityManager.TYPE_MOBILE].setUserDataEnable(enabled);

        }

        if (mNetTrackers[ConnectivityManager.TYPE_WIMAX] != null) {

            if (VDBG) {

                log(mNetTrackers[ConnectivityManager.TYPE_WIMAX].toString() + enabled);

            }

            mNetTrackers[ConnectivityManager.TYPE_WIMAX].setUserDataEnable(enabled);

        }

    }



    @Override