Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make Settings and SysUI estimates use same data class" into qt-dev

Browse Source
This commit is contained in:
Salvador Martinez
2019-04-19 22:00:27 +00:00
committed by Android (Google) Code Review
parent e40719d279 580098fe44
commit d6aa4d3e8e
11 changed files with 158 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
core/java/android/provider/Settings.java
View File

@@ -12665,6 +12665,45 @@ public final class Settings {
@TestApi
public static final String DYNAMIC_POWER_SAVINGS_ENABLED = "dynamic_power_savings_enabled";
/**
* A long value indicating how much longer the system battery is estimated to last in
* millis. See {@link #BATTERY_ESTIMATES_LAST_UPDATE_TIME} for the last time this value
* was updated.
*
* @hide
*/
public static final String TIME_REMAINING_ESTIMATE_MILLIS =
"time_remaining_estimate_millis";
/**
* A boolean indicating whether {@link #TIME_REMAINING_ESTIMATE_MILLIS} is based customized
* to the devices usage or using global models. See
* {@link #BATTERY_ESTIMATES_LAST_UPDATE_TIME} for the last time this value was updated.
*
* @hide
*/
public static final String TIME_REMAINING_ESTIMATE_BASED_ON_USAGE =
"time_remaining_estimate_based_on_usage";
/**
* A long value indicating how long the system battery takes to deplete from 100% to 0% on
* average based on historical drain rates. See {@link #BATTERY_ESTIMATES_LAST_UPDATE_TIME}
* for the last time this value was updated.
*
* @hide
*/
public static final String AVERAGE_TIME_TO_DISCHARGE = "average_time_to_discharge";
/**
* A long indicating the epoch time in milliseconds when
* {@link #TIME_REMAINING_ESTIMATE_MILLIS}, {@link #TIME_REMAINING_ESTIMATE_BASED_ON_USAGE},
* and {@link #AVERAGE_TIME_TO_DISCHARGE} were last updated.
*
* @hide
*/
public static final String BATTERY_ESTIMATES_LAST_UPDATE_TIME =
"battery_estimates_last_update_time";
/**
* The max value for {@link #LOW_POWER_MODE_TRIGGER_LEVEL}. If this setting is not set
* or the value is 0, the default max will be used.

4
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -130,8 +130,10 @@ public class SettingsBackupTest {
Settings.Global.AUTOFILL_MAX_PARTITIONS_SIZE,
Settings.Global.AUTOFILL_MAX_VISIBLE_DATASETS,
Settings.Global.AUTOMATIC_POWER_SAVE_MODE,
Settings.Global.AVERAGE_TIME_TO_DISCHARGE,
Settings.Global.BACKGROUND_ACTIVITY_STARTS_ENABLED,
Settings.Global.BATTERY_CHARGING_STATE_UPDATE_DELAY,
Settings.Global.BATTERY_ESTIMATES_LAST_UPDATE_TIME,
Settings.Global.BROADCAST_BG_CONSTANTS,
Settings.Global.BROADCAST_FG_CONSTANTS,
Settings.Global.BROADCAST_OFFLOAD_CONSTANTS,
@@ -462,6 +464,8 @@ public class SettingsBackupTest {
Settings.Global.TEXT_CLASSIFIER_ACTION_MODEL_PARAMS,
Settings.Global.THEATER_MODE_ON,
Settings.Global.TIME_ONLY_MODE_CONSTANTS,
Settings.Global.TIME_REMAINING_ESTIMATE_MILLIS,
Settings.Global.TIME_REMAINING_ESTIMATE_BASED_ON_USAGE,
Settings.Global.TRANSITION_ANIMATION_SCALE,
Settings.Global.TRUSTED_SOUND,
Settings.Global.TZINFO_UPDATE_CONTENT_URL,

3
packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java
View File

@@ -37,7 +37,8 @@ public class BatterySaverUtils {
/**
* When set to "true" the notification will be a generic confirm message instead of asking the
* user if they want to turn on battery saver. If set to false the dialog will specifically
* talk about turning on battery saver and provide a button for taking the action.
* talk about battery saver without giving the option of turning it on. The only button visible
* will be a generic confirmation button to acknowledge the dialog.
*/
public static final String EXTRA_CONFIRM_TEXT_ONLY = "extra_confirm_only";
/**

81
packages/SettingsLib/src/com/android/settingslib/fuelgauge/Estimate.kt Normal file
View File

@@ -0,0 +1,81 @@
/*
* Copyright (C) 2019 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/
package com.android.settingslib.fuelgauge
import android.content.Context
import android.provider.Settings
import java.time.Duration
import java.time.Instant
const val AVERAGE_TIME_TO_DISCHARGE_UNKNOWN = -1
const val ESTIMATE_MILLIS_UNKNOWN = -1
class Estimate(
val estimateMillis: Long,
val isBasedOnUsage: Boolean,
val averageDischargeTime: Long
) {
companion object {
/**
* Returns the cached estimate if it is available and fresh. Will return null if estimate is
* unavailable or older than 2 minutes.
*
* @param context A valid context
* @return An [Estimate] object with the latest battery estimates.
*/
@JvmStatic
fun getCachedEstimateIfAvailable(context: Context): Estimate? {
// if time > 2 min return null or the estimate otherwise
val resolver = context.contentResolver
val lastUpdateTime = Instant.ofEpochMilli(
Settings.Global.getLong(
resolver, Settings.Global.BATTERY_ESTIMATES_LAST_UPDATE_TIME, -1))
return if (Duration.between(lastUpdateTime,
Instant.now()).compareTo(Duration.ofMinutes(2)) > 0) {
null
} else Estimate(
Settings.Global.getLong(resolver,
Settings.Global.TIME_REMAINING_ESTIMATE_MILLIS,
ESTIMATE_MILLIS_UNKNOWN.toLong()),
Settings.Global.getInt(resolver,
Settings.Global.TIME_REMAINING_ESTIMATE_BASED_ON_USAGE, 0) == 1,
Settings.Global.getLong(resolver, Settings.Global.AVERAGE_TIME_TO_DISCHARGE,
AVERAGE_TIME_TO_DISCHARGE_UNKNOWN.toLong()))
}
/**
* Stores an estimate to the cache along with a timestamp. Can be obtained via
* [.getCachedEstimateIfAvailable].
*
* @param context A valid context
* @param estimate the [Estimate] object to store
*/
@JvmStatic
fun storeCachedEstimate(context: Context, estimate: Estimate) {
// store the estimate and update the timestamp
val resolver = context.contentResolver
Settings.Global.putLong(resolver, Settings.Global.TIME_REMAINING_ESTIMATE_MILLIS,
estimate.estimateMillis)
Settings.Global.putInt(resolver, Settings.Global.TIME_REMAINING_ESTIMATE_BASED_ON_USAGE,
if (estimate.isBasedOnUsage) 1 else 0)
Settings.Global.putLong(resolver, Settings.Global.AVERAGE_TIME_TO_DISCHARGE,
estimate.averageDischargeTime)
Settings.Global.putLong(resolver, Settings.Global.BATTERY_ESTIMATES_LAST_UPDATE_TIME,
System.currentTimeMillis())
}
}
}

26
packages/SystemUI/src/com/android/systemui/power/BatteryStateSnapshot.kt
View File

@@ -15,6 +15,7 @@ data class BatteryStateSnapshot(
val severeLevelThreshold: Int,
val lowLevelThreshold: Int,
val timeRemainingMillis: Long,
val averageTimeToDischargeMillis: Long,
val severeThresholdMillis: Long,
val lowThresholdMillis: Long,
val isBasedOnUsage: Boolean,
@@ -39,18 +40,19 @@ data class BatteryStateSnapshot(
severeLevelThreshold: Int,
lowLevelThreshold: Int
) : this(
batteryLevel,
isPowerSaver,
plugged,
bucket,
batteryStatus,
severeLevelThreshold,
lowLevelThreshold,
NO_ESTIMATE_AVAILABLE.toLong(),
NO_ESTIMATE_AVAILABLE.toLong(),
NO_ESTIMATE_AVAILABLE.toLong(),
false,
true
batteryLevel,
isPowerSaver,
plugged,
bucket,
batteryStatus,
severeLevelThreshold,
lowLevelThreshold,
NO_ESTIMATE_AVAILABLE.toLong(),
NO_ESTIMATE_AVAILABLE.toLong(),
NO_ESTIMATE_AVAILABLE.toLong(),
NO_ESTIMATE_AVAILABLE.toLong(),
false,
true
) {
this.isHybrid = false
}

2
packages/SystemUI/src/com/android/systemui/power/EnhancedEstimates.java
View File

@@ -1,5 +1,7 @@
package com.android.systemui.power;
import com.android.settingslib.fuelgauge.Estimate;
public interface EnhancedEstimates {
/**

2
packages/SystemUI/src/com/android/systemui/power/EnhancedEstimatesImpl.java
View File

@@ -1,5 +1,7 @@
package com.android.systemui.power;
import com.android.settingslib.fuelgauge.Estimate;
public class EnhancedEstimatesImpl implements EnhancedEstimates {
@Override

3
packages/SystemUI/src/com/android/systemui/power/Estimate.kt
View File

@@ -1,3 +0,0 @@
package com.android.systemui.power
data class Estimate(val estimateMillis: Long, val isBasedOnUsage: Boolean)

5
packages/SystemUI/src/com/android/systemui/power/PowerUI.java
View File

@@ -42,6 +42,7 @@ import android.util.Log;
import android.util.Slog;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settingslib.fuelgauge.Estimate;
import com.android.settingslib.utils.ThreadUtils;
import com.android.systemui.Dependency;
import com.android.systemui.R;
@@ -283,6 +284,7 @@ public class PowerUI extends SystemUI {
mCurrentBatteryStateSnapshot = new BatteryStateSnapshot(mBatteryLevel, isPowerSaverMode,
plugged, bucket, mBatteryStatus, mLowBatteryReminderLevels[1],
mLowBatteryReminderLevels[0], estimate.getEstimateMillis(),
estimate.getAverageDischargeTime(),
mEnhancedEstimates.getSevereWarningThreshold(),
mEnhancedEstimates.getLowWarningThreshold(), estimate.isBasedOnUsage(),
mEnhancedEstimates.getLowWarningEnabled());
@@ -316,7 +318,8 @@ public class PowerUI extends SystemUI {
return estimate;
}
return new Estimate(mLastBatteryStateSnapshot.getTimeRemainingMillis(),
mLastBatteryStateSnapshot.isBasedOnUsage());
mLastBatteryStateSnapshot.isBasedOnUsage(),
mLastBatteryStateSnapshot.getAverageTimeToDischargeMillis());
}
@VisibleForTesting

2
packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java
View File

@@ -31,10 +31,10 @@ import androidx.annotation.Nullable;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settingslib.fuelgauge.BatterySaverUtils;
import com.android.settingslib.fuelgauge.Estimate;
import com.android.settingslib.utils.PowerUtil;
import com.android.systemui.Dependency;
import com.android.systemui.power.EnhancedEstimates;
import com.android.systemui.power.Estimate;
import java.io.FileDescriptor;
import java.io.PrintWriter;

16
packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java
View File

@@ -40,6 +40,7 @@ import android.testing.TestableLooper;
import android.testing.TestableLooper.RunWithLooper;
import android.testing.TestableResources;
import com.android.settingslib.fuelgauge.Estimate;
import com.android.systemui.R;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.power.PowerUI.WarningsUI;
@@ -358,7 +359,7 @@ public class PowerUITest extends SysuiTestCase {
@Test
public void testRefreshEstimateIfNeeded_onlyQueriesEstimateOnBatteryLevelChangeOrNull() {
mPowerUI.start();
Estimate estimate = new Estimate(BELOW_HYBRID_THRESHOLD, true);
Estimate estimate = new Estimate(BELOW_HYBRID_THRESHOLD, true, 0);
when(mEnhancedEstimates.isHybridNotificationEnabled()).thenReturn(true);
when(mEnhancedEstimates.getLowWarningThreshold()).thenReturn(PowerUI.THREE_HOURS_IN_MILLIS);
when(mEnhancedEstimates.getSevereWarningThreshold()).thenReturn(ONE_HOUR_MILLIS);
@@ -371,21 +372,21 @@ public class PowerUITest extends SysuiTestCase {
assertThat(refreshedEstimate.getEstimateMillis()).isEqualTo(BELOW_HYBRID_THRESHOLD);
BatteryStateSnapshot snapshot = new BatteryStateSnapshot(
BATTERY_LEVEL_10, false, false, 0, BatteryManager.BATTERY_HEALTH_GOOD,
0, 0, -1, 0, 0, false, true);
0, 0, -1, 0, 0, 0, false, true);
mPowerUI.mLastBatteryStateSnapshot = snapshot;
// query again since the estimate was -1
estimate = new Estimate(BELOW_SEVERE_HYBRID_THRESHOLD, true);
estimate = new Estimate(BELOW_SEVERE_HYBRID_THRESHOLD, true, 0);
when(mEnhancedEstimates.getEstimate()).thenReturn(estimate);
refreshedEstimate = mPowerUI.refreshEstimateIfNeeded();
assertThat(refreshedEstimate.getEstimateMillis()).isEqualTo(BELOW_SEVERE_HYBRID_THRESHOLD);
snapshot = new BatteryStateSnapshot(
BATTERY_LEVEL_10, false, false, 0, BatteryManager.BATTERY_HEALTH_GOOD, 0,
0, BELOW_SEVERE_HYBRID_THRESHOLD, 0, 0, false, true);
0, BELOW_SEVERE_HYBRID_THRESHOLD, 0, 0, 0, false, true);
mPowerUI.mLastBatteryStateSnapshot = snapshot;
// Battery level hasn't changed, so we don't query again
estimate = new Estimate(BELOW_HYBRID_THRESHOLD, true);
estimate = new Estimate(BELOW_HYBRID_THRESHOLD, true, 0);
when(mEnhancedEstimates.getEstimate()).thenReturn(estimate);
refreshedEstimate = mPowerUI.refreshEstimateIfNeeded();
assertThat(refreshedEstimate.getEstimateMillis()).isEqualTo(BELOW_SEVERE_HYBRID_THRESHOLD);
@@ -543,13 +544,14 @@ public class PowerUITest extends SysuiTestCase {
public boolean mIsBasedOnUsage = true;
public boolean mIsHybrid = true;
public boolean mIsLowLevelWarningEnabled = true;
private long mAverageTimeToDischargeMillis = Duration.ofHours(24).toMillis();
public BatteryStateSnapshot get() {
if (mIsHybrid) {
return new BatteryStateSnapshot(mBatteryLevel, mIsPowerSaver, mPlugged, mBucket,
mBatteryStatus, mSevereLevelThreshold, mLowLevelThreshold,
mTimeRemainingMillis, mSevereThresholdMillis, mLowThresholdMillis,
mIsBasedOnUsage, mIsLowLevelWarningEnabled);
mTimeRemainingMillis, mAverageTimeToDischargeMillis, mSevereThresholdMillis,
mLowThresholdMillis, mIsBasedOnUsage, mIsLowLevelWarningEnabled);
} else {
return new BatteryStateSnapshot(mBatteryLevel, mIsPowerSaver, mPlugged, mBucket,
mBatteryStatus, mSevereLevelThreshold, mLowLevelThreshold);