Loading AndroidManifest.xml +3 −0 Original line number Diff line number Diff line Loading @@ -3306,6 +3306,9 @@ </intent-filter> </receiver> <service android:name=".fuelgauge.batterytip.AnomalyCleanUpJobService" 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 Loading @@ -18,6 +18,7 @@ --> <resources> <item type="id" name="preference_highlighted" /> <item type="id" name="job_anomaly_clean_up" /> <item type="id" name="lock_none" /> <item type="id" name="lock_pin" /> Loading src/com/android/settings/fuelgauge/batterytip/AnomalyCleanUpJobService.java 0 → 100644 +75 −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 android.app.job.JobInfo; import android.app.job.JobParameters; import android.app.job.JobScheduler; import android.app.job.JobService; import android.content.ComponentName; import android.content.Context; import android.os.AsyncTask; import android.support.annotation.VisibleForTesting; import android.util.Log; import com.android.settings.R; import com.android.settingslib.utils.ThreadUtils; import java.util.concurrent.TimeUnit; /** A JobService to clean up obsolete data in anomaly database */ public class AnomalyCleanUpJobService extends JobService { private static final String TAG = "AnomalyCleanUpJobService"; @VisibleForTesting static final long CLEAN_UP_FREQUENCY_MS = TimeUnit.DAYS.toMillis(1); public static void scheduleCleanUp(Context context) { final JobScheduler jobScheduler = context.getSystemService(JobScheduler.class); final ComponentName component = new ComponentName(context, AnomalyCleanUpJobService.class); final JobInfo.Builder jobBuilder = new JobInfo.Builder(R.id.job_anomaly_clean_up, component) .setMinimumLatency(CLEAN_UP_FREQUENCY_MS) .setRequiresDeviceIdle(true) .setPersisted(true); if (jobScheduler.schedule(jobBuilder.build()) != JobScheduler.RESULT_SUCCESS) { Log.i(TAG, "Anomaly clean up job service schedule failed."); } } @Override public boolean onStartJob(JobParameters params) { final BatteryDatabaseManager batteryDatabaseManager = BatteryDatabaseManager .getInstance(this); final BatteryTipPolicy policy = new BatteryTipPolicy(this); ThreadUtils.postOnBackgroundThread(() -> { batteryDatabaseManager.deleteAllAnomaliesBeforeTimeStamp( System.currentTimeMillis() - TimeUnit.HOURS.toMillis( policy.dataHistoryRetainHour)); jobFinished(params, false /* wantsReschedule */); }); return true; } @Override public boolean onStopJob(JobParameters jobParameters) { return true; } } src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionReceiver.java +3 −1 Original line number Diff line number Diff line Loading @@ -36,7 +36,7 @@ public class AnomalyDetectionReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { final BatteryDatabaseManager databaseManager = new BatteryDatabaseManager(context); final BatteryDatabaseManager databaseManager = BatteryDatabaseManager.getInstance(context); final BatteryUtils batteryUtils = BatteryUtils.getInstance(context); final long configUid = intent.getLongExtra(StatsManager.EXTRA_STATS_CONFIG_UID, -1); final long configKey = intent.getLongExtra(StatsManager.EXTRA_STATS_CONFIG_KEY, -1); Loading @@ -46,6 +46,8 @@ public class AnomalyDetectionReceiver extends BroadcastReceiver { Log.i(TAG, "Anomaly intent received. configUid = " + configUid + " configKey = " + configKey + " subscriptionId = " + subscriptionId); saveAnomalyToDatabase(databaseManager, batteryUtils, intent); AnomalyCleanUpJobService.scheduleCleanUp(context); } @VisibleForTesting Loading src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java +10 −1 Original line number Diff line number Diff line Loading @@ -19,7 +19,6 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; import android.provider.Settings; import android.support.annotation.VisibleForTesting; import android.text.format.DateUtils; import android.util.KeyValueListParser; import android.util.Log; Loading @@ -44,6 +43,7 @@ public class BatteryTipPolicy { private static final String KEY_REDUCED_BATTERY_PERCENT = "reduced_battery_percent"; private static final String KEY_LOW_BATTERY_ENABLED = "low_battery_enabled"; private static final String KEY_LOW_BATTERY_HOUR = "low_battery_hour"; private static final String KEY_DATA_HISTORY_RETAIN_HOUR = "data_history_retain_hour"; /** * {@code true} if general battery tip is enabled Loading Loading @@ -143,6 +143,14 @@ public class BatteryTipPolicy { */ public final int lowBatteryHour; /** * TTL hour for anomaly data stored in database * * @see Settings.Global#BATTERY_TIP_CONSTANTS * @see #KEY_DATA_HISTORY_RETAIN_HOUR */ public final int dataHistoryRetainHour; private final KeyValueListParser mParser; public BatteryTipPolicy(Context context) { Loading Loading @@ -174,6 +182,7 @@ public class BatteryTipPolicy { reducedBatteryPercent = mParser.getInt(KEY_REDUCED_BATTERY_PERCENT, 50); lowBatteryEnabled = mParser.getBoolean(KEY_LOW_BATTERY_ENABLED, false); lowBatteryHour = mParser.getInt(KEY_LOW_BATTERY_HOUR, 16); dataHistoryRetainHour = mParser.getInt(KEY_DATA_HISTORY_RETAIN_HOUR, 72); } } Loading
AndroidManifest.xml +3 −0 Original line number Diff line number Diff line Loading @@ -3306,6 +3306,9 @@ </intent-filter> </receiver> <service android:name=".fuelgauge.batterytip.AnomalyCleanUpJobService" 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 Loading @@ -18,6 +18,7 @@ --> <resources> <item type="id" name="preference_highlighted" /> <item type="id" name="job_anomaly_clean_up" /> <item type="id" name="lock_none" /> <item type="id" name="lock_pin" /> Loading
src/com/android/settings/fuelgauge/batterytip/AnomalyCleanUpJobService.java 0 → 100644 +75 −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 android.app.job.JobInfo; import android.app.job.JobParameters; import android.app.job.JobScheduler; import android.app.job.JobService; import android.content.ComponentName; import android.content.Context; import android.os.AsyncTask; import android.support.annotation.VisibleForTesting; import android.util.Log; import com.android.settings.R; import com.android.settingslib.utils.ThreadUtils; import java.util.concurrent.TimeUnit; /** A JobService to clean up obsolete data in anomaly database */ public class AnomalyCleanUpJobService extends JobService { private static final String TAG = "AnomalyCleanUpJobService"; @VisibleForTesting static final long CLEAN_UP_FREQUENCY_MS = TimeUnit.DAYS.toMillis(1); public static void scheduleCleanUp(Context context) { final JobScheduler jobScheduler = context.getSystemService(JobScheduler.class); final ComponentName component = new ComponentName(context, AnomalyCleanUpJobService.class); final JobInfo.Builder jobBuilder = new JobInfo.Builder(R.id.job_anomaly_clean_up, component) .setMinimumLatency(CLEAN_UP_FREQUENCY_MS) .setRequiresDeviceIdle(true) .setPersisted(true); if (jobScheduler.schedule(jobBuilder.build()) != JobScheduler.RESULT_SUCCESS) { Log.i(TAG, "Anomaly clean up job service schedule failed."); } } @Override public boolean onStartJob(JobParameters params) { final BatteryDatabaseManager batteryDatabaseManager = BatteryDatabaseManager .getInstance(this); final BatteryTipPolicy policy = new BatteryTipPolicy(this); ThreadUtils.postOnBackgroundThread(() -> { batteryDatabaseManager.deleteAllAnomaliesBeforeTimeStamp( System.currentTimeMillis() - TimeUnit.HOURS.toMillis( policy.dataHistoryRetainHour)); jobFinished(params, false /* wantsReschedule */); }); return true; } @Override public boolean onStopJob(JobParameters jobParameters) { return true; } }
src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionReceiver.java +3 −1 Original line number Diff line number Diff line Loading @@ -36,7 +36,7 @@ public class AnomalyDetectionReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { final BatteryDatabaseManager databaseManager = new BatteryDatabaseManager(context); final BatteryDatabaseManager databaseManager = BatteryDatabaseManager.getInstance(context); final BatteryUtils batteryUtils = BatteryUtils.getInstance(context); final long configUid = intent.getLongExtra(StatsManager.EXTRA_STATS_CONFIG_UID, -1); final long configKey = intent.getLongExtra(StatsManager.EXTRA_STATS_CONFIG_KEY, -1); Loading @@ -46,6 +46,8 @@ public class AnomalyDetectionReceiver extends BroadcastReceiver { Log.i(TAG, "Anomaly intent received. configUid = " + configUid + " configKey = " + configKey + " subscriptionId = " + subscriptionId); saveAnomalyToDatabase(databaseManager, batteryUtils, intent); AnomalyCleanUpJobService.scheduleCleanUp(context); } @VisibleForTesting Loading
src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java +10 −1 Original line number Diff line number Diff line Loading @@ -19,7 +19,6 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; import android.provider.Settings; import android.support.annotation.VisibleForTesting; import android.text.format.DateUtils; import android.util.KeyValueListParser; import android.util.Log; Loading @@ -44,6 +43,7 @@ public class BatteryTipPolicy { private static final String KEY_REDUCED_BATTERY_PERCENT = "reduced_battery_percent"; private static final String KEY_LOW_BATTERY_ENABLED = "low_battery_enabled"; private static final String KEY_LOW_BATTERY_HOUR = "low_battery_hour"; private static final String KEY_DATA_HISTORY_RETAIN_HOUR = "data_history_retain_hour"; /** * {@code true} if general battery tip is enabled Loading Loading @@ -143,6 +143,14 @@ public class BatteryTipPolicy { */ public final int lowBatteryHour; /** * TTL hour for anomaly data stored in database * * @see Settings.Global#BATTERY_TIP_CONSTANTS * @see #KEY_DATA_HISTORY_RETAIN_HOUR */ public final int dataHistoryRetainHour; private final KeyValueListParser mParser; public BatteryTipPolicy(Context context) { Loading Loading @@ -174,6 +182,7 @@ public class BatteryTipPolicy { reducedBatteryPercent = mParser.getInt(KEY_REDUCED_BATTERY_PERCENT, 50); lowBatteryEnabled = mParser.getBoolean(KEY_LOW_BATTERY_ENABLED, false); lowBatteryHour = mParser.getInt(KEY_LOW_BATTERY_HOUR, 16); dataHistoryRetainHour = mParser.getInt(KEY_DATA_HISTORY_RETAIN_HOUR, 72); } }