Merge "Adding per UID WiFi power distribution."

This commit is contained in:
Adam Lesinski
2015-04-07 01:52:57 +00:00
committed by Android (Google) Code Review

View File

@@ -1487,7 +1487,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
NetworkCapabilities.TRANSPORT_WIFI)) { NetworkCapabilities.TRANSPORT_WIFI)) {
timeout = Settings.Global.getInt(mContext.getContentResolver(), timeout = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.DATA_ACTIVITY_TIMEOUT_WIFI, Settings.Global.DATA_ACTIVITY_TIMEOUT_WIFI,
0); 5);
type = ConnectivityManager.TYPE_WIFI; type = ConnectivityManager.TYPE_WIFI;
} else { } else {
// do not track any other networks // do not track any other networks