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

Merge "Sets an auto dismiss action for sticky disabled notification"

Browse Source
This commit is contained in:
YK Hung
2023-02-15 02:08:04 +00:00
committed by Android (Google) Code Review
parent bcb371357f ff854b5f35
commit f7f05bae00
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/power/batterysaver/BatterySaverStateMachine.java
View File

@@ -46,6 +46,7 @@ import com.android.server.EventLogTags;
import com.android.server.power.BatterySaverStateMachineProto;
import java.io.PrintWriter;
import java.time.Duration;
/**
* Decides when to enable / disable battery saver.
@@ -106,6 +107,8 @@ public class BatterySaverStateMachine {
/** Turn off adaptive battery saver if the device has charged above this level. */
private static final int ADAPTIVE_AUTO_DISABLE_BATTERY_LEVEL = 80;
private static final long STICKY_DISABLED_NOTIFY_TIMEOUT_MS = Duration.ofHours(12).toMillis();
private static final int STATE_OFF = BatterySaverStateMachineProto.STATE_OFF;
/** Turned on manually by the user. */
@@ -829,7 +832,7 @@ public class BatterySaverStateMachine {
buildNotification(DYNAMIC_MODE_NOTIF_CHANNEL_ID,
R.string.dynamic_mode_notification_title,
R.string.dynamic_mode_notification_summary,
Settings.ACTION_BATTERY_SAVER_SETTINGS),
Settings.ACTION_BATTERY_SAVER_SETTINGS, 0L),
UserHandle.ALL);
});
}
@@ -847,7 +850,8 @@ public class BatterySaverStateMachine {
buildNotification(BATTERY_SAVER_NOTIF_CHANNEL_ID,
R.string.battery_saver_off_notification_title,
R.string.battery_saver_charged_notification_summary,
Settings.ACTION_BATTERY_SAVER_SETTINGS),
Settings.ACTION_BATTERY_SAVER_SETTINGS,
STICKY_DISABLED_NOTIFY_TIMEOUT_MS),
UserHandle.ALL);
});
}
@@ -862,7 +866,7 @@ public class BatterySaverStateMachine {
}
private Notification buildNotification(@NonNull String channelId, @StringRes int titleId,
@StringRes int summaryId, @NonNull String intentAction) {
@StringRes int summaryId, @NonNull String intentAction, long timeoutMs) {
Resources res = mContext.getResources();
Intent intent = new Intent(intentAction);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
@@ -880,6 +884,7 @@ public class BatterySaverStateMachine {
.setStyle(new Notification.BigTextStyle().bigText(summary))
.setOnlyAlertOnce(true)
.setAutoCancel(true)
.setTimeoutAfter(timeoutMs)
.build();
}