Merge "Build extra data in wakeup anomaly" into oc-dr1-dev am: b327a6bccd

am: a62c67be0e

Change-Id: Ie7b1fbc669d0d740cf7fec7180ba64894ee73761
This commit is contained in:
jackqdyulei
2017-07-18 03:01:08 +00:00
committed by android-build-merger
3 changed files with 40 additions and 21 deletions

View File

@@ -91,17 +91,12 @@ public class WakeLockAnomalyDetector implements AnomalyDetector {
final String packageName = mBatteryUtils.getPackageName(uid.getUid());
final CharSequence displayName = Utils.getApplicationLabel(mContext,
packageName);
final int targetSdkVersion = mBatteryUtils.getTargetSdkVersion(packageName);
Anomaly anomaly = new Anomaly.Builder()
.setUid(uid.getUid())
.setType(Anomaly.AnomalyType.WAKE_LOCK)
.setDisplayName(displayName)
.setPackageName(packageName)
.setTargetSdkVersion(targetSdkVersion)
.setBackgroundRestrictionEnabled(
mBatteryUtils.isBackgroundRestrictionEnabled(targetSdkVersion,
uid.getUid(), packageName))
.build();
if (mAnomalyUtils.getAnomalyAction(anomaly).isActionActive(anomaly)) {

View File

@@ -89,12 +89,17 @@ public class WakeupAlarmAnomalyDetector implements AnomalyDetector {
final String packageName = mBatteryUtils.getPackageName(uid.getUid());
final CharSequence displayName = Utils.getApplicationLabel(mContext,
packageName);
final int targetSdkVersion = mBatteryUtils.getTargetSdkVersion(packageName);
Anomaly anomaly = new Anomaly.Builder()
.setUid(uid.getUid())
.setType(Anomaly.AnomalyType.WAKEUP_ALARM)
.setDisplayName(displayName)
.setPackageName(packageName)
.setTargetSdkVersion(targetSdkVersion)
.setBackgroundRestrictionEnabled(
mBatteryUtils.isBackgroundRestrictionEnabled(targetSdkVersion,
uid.getUid(), packageName))
.build();
if (mAnomalyUtils.getAnomalyAction(anomaly).isActionActive(anomaly)) {