Merge changes from topic "ww_5_auto_restrict" (43a2ac6c) · Commits · e / os / android_packages_apps_Settings

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ LOCAL_JAVA_LIBRARIES := \
		LOCAL_STATIC_JAVA_LIBRARIES := \
		android-arch-lifecycle-runtime \
		android-arch-lifecycle-extensions \
		guava \
		jsr305 \
		settings-logtags \

AndroidManifest.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -3299,6 +3299,9 @@
		<service android:name=".fuelgauge.batterytip.AnomalyCleanUpJobService"
		android:permission="android.permission.BIND_JOB_SERVICE" />

		<service android:name=".fuelgauge.batterytip.AnomalyDetectionJobService"
		android:permission="android.permission.BIND_JOB_SERVICE" />

		<!-- This is the longest AndroidManifest.xml ever. -->
		</application>
		</manifest>

res/values/ids.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		<resources>
		<item type="id" name="preference_highlighted" />
		<item type="id" name="job_anomaly_clean_up" />
		<item type="id" name="job_anomaly_detection" />

		<item type="id" name="lock_none" />
		<item type="id" name="lock_pin" />

src/com/android/settings/fuelgauge/BatteryUtils.java

+35 −2

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ import com.android.settings.fuelgauge.anomaly.Anomaly;
		import com.android.settings.overlay.FeatureFactory;

		import com.android.settingslib.utils.PowerUtil;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.Collections;
		@@ -69,6 +70,7 @@ public class BatteryUtils {
		int BACKGROUND = 2;
		int ALL = 3;
		}

		private static final String TAG = "BatteryUtils";

		private static final int MIN_POWER_THRESHOLD_MILLI_AMP = 5;
		@@ -81,6 +83,7 @@ public class BatteryUtils {
		private Context mContext;
		@VisibleForTesting
		PowerUsageFeatureProvider mPowerUsageFeatureProvider;

		public static BatteryUtils getInstance(Context context) {
		if (sInstance == null \|\| sInstance.isDataCorrupted()) {
		sInstance = new BatteryUtils(context);
		@@ -153,8 +156,7 @@ public class BatteryUtils {
		private long getProcessForegroundTimeMs(BatteryStats.Uid uid, int which) {
		final long rawRealTimeUs = PowerUtil.convertMsToUs(SystemClock.elapsedRealtime());
		return getScreenUsageTimeMs(uid, which, rawRealTimeUs)
		+ PowerUtil.convertUsToMs(
		getForegroundServiceTotalTimeUs(uid, rawRealTimeUs));
		+ PowerUtil.convertUsToMs(getForegroundServiceTotalTimeUs(uid, rawRealTimeUs));
		}

		/**
		@@ -349,6 +351,7 @@ public class BatteryUtils {

		/**
		* Calculate the screen usage time since last full charge.
		*
		* @param batteryStatsHelper utility class that contains the screen usage data
		* @return time in millis
		*/
		@@ -500,5 +503,35 @@ public class BatteryUtils {
		return false;
		}

		/**
		* Check if the app represented by {@code uid} has battery usage more than {@code threshold}
		*
		* @param batteryStatsHelper used to check the battery usage
		* @param userManager used to init the {@code batteryStatsHelper}
		* @param uid represent the app
		* @param threshold battery percentage threshold(e.g. 10 means 10% battery usage )
		* @return {@code true} if battery drain is more than the threshold
		*/
		public boolean isAppHeavilyUsed(BatteryStatsHelper batteryStatsHelper, UserManager userManager,
		int uid, int threshold) {
		initBatteryStatsHelper(batteryStatsHelper, null /* bundle */, userManager);
		final int dischargeAmount = batteryStatsHelper.getStats().getDischargeAmount(
		BatteryStats.STATS_SINCE_CHARGED);
		List<BatterySipper> batterySippers = batteryStatsHelper.getUsageList();
		final double hiddenAmount = removeHiddenBatterySippers(batterySippers);

		for (int i = 0, size = batterySippers.size(); i < size; i++) {
		final BatterySipper batterySipper = batterySippers.get(i);
		if (batterySipper.getUid() == uid) {
		final int percent = (int) calculateBatteryPercent(
		batterySipper.totalPowerMah, batteryStatsHelper.getTotalPower(),
		hiddenAmount,
		dischargeAmount);
		return percent >= threshold;
		}
		}

		return false;
		}
		}

src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java

0 → 100644

+177 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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.settings.fuelgauge.batterytip;

		import static android.os.StatsDimensionsValue.INT_VALUE_TYPE;
		import static android.os.StatsDimensionsValue.TUPLE_VALUE_TYPE;

		import android.app.AppOpsManager;
		import android.app.StatsManager;
		import android.app.job.JobInfo;
		import android.app.job.JobParameters;
		import android.app.job.JobScheduler;
		import android.app.job.JobService;
		import android.app.job.JobWorkItem;
		import android.content.ComponentName;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.os.Bundle;
		import android.os.StatsDimensionsValue;
		import android.os.SystemPropertiesProto;
		import android.os.UserManager;
		import android.provider.Settings;
		import android.support.annotation.VisibleForTesting;
		import android.util.Log;

		import com.android.internal.os.BatteryStatsHelper;
		import com.android.settings.R;
		import com.android.settings.fuelgauge.BatteryUtils;
		import com.android.settingslib.utils.ThreadUtils;

		import java.util.List;
		import java.util.concurrent.TimeUnit;

		/** A JobService to store anomaly data to anomaly database */
		public class AnomalyDetectionJobService extends JobService {
		private static final String TAG = "AnomalyDetectionService";
		private static final int UID_NULL = 0;
		private static final int STATSD_UID_FILED = 1;
		private static final int ON = 1;

		@VisibleForTesting
		static final long MAX_DELAY_MS = TimeUnit.MINUTES.toMillis(30);

		public static void scheduleAnomalyDetection(Context context, Intent intent) {
		final JobScheduler jobScheduler = context.getSystemService(JobScheduler.class);
		final ComponentName component = new ComponentName(context,
		AnomalyDetectionJobService.class);
		final JobInfo.Builder jobBuilder =
		new JobInfo.Builder(R.id.job_anomaly_detection, component)
		.setOverrideDeadline(MAX_DELAY_MS);

		if (jobScheduler.enqueue(jobBuilder.build(), new JobWorkItem(intent))
		!= JobScheduler.RESULT_SUCCESS) {
		Log.i(TAG, "Anomaly detection job service enqueue failed.");
		}
		}

		@Override
		public boolean onStartJob(JobParameters params) {
		ThreadUtils.postOnBackgroundThread(() -> {
		final BatteryDatabaseManager batteryDatabaseManager =
		BatteryDatabaseManager.getInstance(this);
		final BatteryTipPolicy policy = new BatteryTipPolicy(this);
		final BatteryUtils batteryUtils = BatteryUtils.getInstance(this);
		final ContentResolver contentResolver = getContentResolver();
		final BatteryStatsHelper batteryStatsHelper = new BatteryStatsHelper(this,
		true /* collectBatteryBroadcast */);
		final UserManager userManager = getSystemService(UserManager.class);

		for (JobWorkItem item = params.dequeueWork(); item != null;
		item = params.dequeueWork()) {
		saveAnomalyToDatabase(batteryStatsHelper, userManager, batteryDatabaseManager,
		batteryUtils, policy, contentResolver,
		item.getIntent().getExtras());
		}
		jobFinished(params, false /* wantsReschedule */);
		});

		return true;
		}

		@Override
		public boolean onStopJob(JobParameters jobParameters) {
		return false;
		}

		@VisibleForTesting
		void saveAnomalyToDatabase(BatteryStatsHelper batteryStatsHelper, UserManager userManager,
		BatteryDatabaseManager databaseManager, BatteryUtils batteryUtils,
		BatteryTipPolicy policy, ContentResolver contentResolver, Bundle bundle) {
		// The Example of intentDimsValue is: 35:{1:{1:{1:10013\|}\|}\|}
		final StatsDimensionsValue intentDimsValue =
		bundle.getParcelable(StatsManager.EXTRA_STATS_DIMENSIONS_VALUE);
		final long subscriptionId = bundle.getLong(StatsManager.EXTRA_STATS_SUBSCRIPTION_ID,
		-1);
		final long timeMs = bundle.getLong(AnomalyDetectionReceiver.KEY_ANOMALY_TIMESTAMP,
		System.currentTimeMillis());
		Log.i(TAG, "Extra stats value: " + intentDimsValue.toString());

		try {
		final int uid = extractUidFromStatsDimensionsValue(intentDimsValue);
		final int anomalyType = StatsManagerConfig.getAnomalyTypeFromSubscriptionId(
		subscriptionId);
		final boolean smartBatteryOn = Settings.Global.getInt(contentResolver,
		Settings.Global.APP_STANDBY_ENABLED, ON) == ON;
		final String packageName = batteryUtils.getPackageName(uid);

		if (anomalyType == StatsManagerConfig.AnomalyType.EXCESSIVE_BG) {
		// TODO(b/72385333): check battery percentage draining in batterystats
		if (batteryUtils.isLegacyApp(packageName) && batteryUtils.isAppHeavilyUsed(
		batteryStatsHelper, userManager, uid,
		policy.excessiveBgDrainPercentage)) {
		Log.e(TAG, "Excessive detected uid=" + uid);
		batteryUtils.setForceAppStandby(uid, packageName,
		AppOpsManager.MODE_IGNORED);
		databaseManager.insertAnomaly(packageName, anomalyType,
		smartBatteryOn
		? AnomalyDatabaseHelper.State.AUTO_HANDLED
		: AnomalyDatabaseHelper.State.NEW,
		timeMs);
		}
		} else {
		databaseManager.insertAnomaly(packageName, anomalyType,
		AnomalyDatabaseHelper.State.NEW, timeMs);
		}
		} catch (NullPointerException \| IndexOutOfBoundsException e) {
		Log.e(TAG, "Parse stats dimensions value error.", e);
		}
		}

		/**
		* Extract the uid from {@link StatsDimensionsValue}
		*
		* The uid dimension has the format: 1:<int> inside the tuple list. Here are some examples:
		* 1. Excessive bg anomaly: 27:{1:10089\|}
		* 2. Wakeup alarm anomaly: 35:{1:{1:{1:10013\|}\|}\|}
		* 3. Bluetooth anomaly: 3:{1:{1:{1:10140\|}\|}\|}
		*/
		@VisibleForTesting
		final int extractUidFromStatsDimensionsValue(StatsDimensionsValue statsDimensionsValue) {
		//TODO(b/73172999): Add robo test for this method
		if (statsDimensionsValue == null) {
		return UID_NULL;
		}
		if (statsDimensionsValue.isValueType(INT_VALUE_TYPE)
		&& statsDimensionsValue.getField() == STATSD_UID_FILED) {
		// Find out the real uid
		return statsDimensionsValue.getIntValue();
		}
		if (statsDimensionsValue.isValueType(TUPLE_VALUE_TYPE)) {
		final List<StatsDimensionsValue> values = statsDimensionsValue.getTupleValueList();
		for (int i = 0, size = values.size(); i < size; i++) {
		int uid = extractUidFromStatsDimensionsValue(values.get(i));
		if (uid != UID_NULL) {
		return uid;
		}
		}
		}

		return UID_NULL;
		}
		}