diff options
| -rw-r--r-- | src/com/android/settings/TetherSettings.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/fuelgauge/PowerUsageSummary.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index e27c96e..867f733 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -147,7 +147,7 @@ public class TetherSettings extends SettingsPreferenceFragment getPreferenceScreen().removePreference(mUsbTether); } - if (wifiAvailable) { + if (wifiAvailable && !Utils.isMonkeyRunning()) { mWifiApEnabler = new WifiApEnabler(activity, mEnableWifiAp); initWifiTethering(); } else { diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 6312682..b813ec6 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -579,11 +579,12 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable { if (osApp != null) { long wakeTimeMillis = mStats.computeBatteryUptime( SystemClock.uptimeMillis() * 1000, which) / 1000; - wakeTimeMillis -= appWakelockTime - (mStats.getScreenOnTime( + wakeTimeMillis -= appWakelockTime + (mStats.getScreenOnTime( SystemClock.elapsedRealtime(), which) / 1000); if (wakeTimeMillis > 0) { double power = (wakeTimeMillis * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000; + if (DEBUG) Log.i(TAG, "OS wakeLockTime " + wakeTimeMillis + " power " + power); osApp.wakeLockTime += wakeTimeMillis; osApp.value += power; osApp.values[0] += power; |