summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--services/java/com/android/server/BatteryService.java8
-rwxr-xr-xservices/java/com/android/server/NotificationManagerService.java12
-rwxr-xr-xservices/java/com/android/server/VibratorService.java8
3 files changed, 14 insertions, 14 deletions
diff --git a/services/java/com/android/server/BatteryService.java b/services/java/com/android/server/BatteryService.java
index 2105e05..5dbc2e4 100644
--- a/services/java/com/android/server/BatteryService.java
+++ b/services/java/com/android/server/BatteryService.java
@@ -874,13 +874,13 @@ public final class BatteryService extends Binder {
// Quiet Hours
mQuietHoursEnabled = Settings.System.getIntForUser(resolver,
- Settings.System.QUIET_HOURS_ENABLED, 0, UserHandle.USER_CURRENT) != 0;
+ Settings.System.QUIET_HOURS_ENABLED, 0, UserHandle.USER_CURRENT_OR_SELF) != 0;
mQuietHoursStart = Settings.System.getIntForUser(resolver,
- Settings.System.QUIET_HOURS_START, 0, UserHandle.USER_CURRENT);
+ Settings.System.QUIET_HOURS_START, 0, UserHandle.USER_CURRENT_OR_SELF);
mQuietHoursEnd = Settings.System.getIntForUser(resolver,
- Settings.System.QUIET_HOURS_END, 0, UserHandle.USER_CURRENT);
+ Settings.System.QUIET_HOURS_END, 0, UserHandle.USER_CURRENT_OR_SELF);
mQuietHoursDim = Settings.System.getIntForUser(resolver,
- Settings.System.QUIET_HOURS_DIM, 0, UserHandle.USER_CURRENT) != 0;
+ Settings.System.QUIET_HOURS_DIM, 0, UserHandle.USER_CURRENT_OR_SELF) != 0;
updateLedPulse();
}
diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java
index 05be8b3..a0e810c 100755
--- a/services/java/com/android/server/NotificationManagerService.java
+++ b/services/java/com/android/server/NotificationManagerService.java
@@ -689,17 +689,17 @@ public class NotificationManagerService extends INotificationManager.Stub
public void update() {
ContentResolver resolver = mContext.getContentResolver();
mQuietHoursEnabled = Settings.System.getIntForUser(resolver,
- Settings.System.QUIET_HOURS_ENABLED, 0, UserHandle.USER_CURRENT) != 0;
+ Settings.System.QUIET_HOURS_ENABLED, 0, UserHandle.USER_CURRENT_OR_SELF) != 0;
mQuietHoursStart = Settings.System.getIntForUser(resolver,
- Settings.System.QUIET_HOURS_START, 0, UserHandle.USER_CURRENT);
+ Settings.System.QUIET_HOURS_START, 0, UserHandle.USER_CURRENT_OR_SELF);
mQuietHoursEnd = Settings.System.getIntForUser(resolver,
- Settings.System.QUIET_HOURS_END, 0, UserHandle.USER_CURRENT);
+ Settings.System.QUIET_HOURS_END, 0, UserHandle.USER_CURRENT_OR_SELF);
mQuietHoursMute = Settings.System.getIntForUser(resolver,
- Settings.System.QUIET_HOURS_MUTE, 0, UserHandle.USER_CURRENT) != 0;
+ Settings.System.QUIET_HOURS_MUTE, 0, UserHandle.USER_CURRENT_OR_SELF) != 0;
mQuietHoursStill = Settings.System.getIntForUser(resolver,
- Settings.System.QUIET_HOURS_STILL, 0, UserHandle.USER_CURRENT) != 0;
+ Settings.System.QUIET_HOURS_STILL, 0, UserHandle.USER_CURRENT_OR_SELF) != 0;
mQuietHoursDim = Settings.System.getIntForUser(resolver,
- Settings.System.QUIET_HOURS_DIM, 0, UserHandle.USER_CURRENT) != 0;
+ Settings.System.QUIET_HOURS_DIM, 0, UserHandle.USER_CURRENT_OR_SELF) != 0;
}
}
diff --git a/services/java/com/android/server/VibratorService.java b/services/java/com/android/server/VibratorService.java
index 5f22bbe..805fd16 100755
--- a/services/java/com/android/server/VibratorService.java
+++ b/services/java/com/android/server/VibratorService.java
@@ -167,13 +167,13 @@ public class VibratorService extends IVibratorService.Stub
private boolean inQuietHours() {
boolean quietHoursEnabled = Settings.System.getIntForUser(mContext.getContentResolver(),
- Settings.System.QUIET_HOURS_ENABLED, 0, UserHandle.USER_CURRENT) != 0;
+ Settings.System.QUIET_HOURS_ENABLED, 0, UserHandle.USER_CURRENT_OR_SELF) != 0;
int quietHoursStart = Settings.System.getIntForUser(mContext.getContentResolver(),
- Settings.System.QUIET_HOURS_START, 0, UserHandle.USER_CURRENT);
+ Settings.System.QUIET_HOURS_START, 0, UserHandle.USER_CURRENT_OR_SELF);
int quietHoursEnd = Settings.System.getIntForUser(mContext.getContentResolver(),
- Settings.System.QUIET_HOURS_END, 0, UserHandle.USER_CURRENT);
+ Settings.System.QUIET_HOURS_END, 0, UserHandle.USER_CURRENT_OR_SELF);
boolean quietHoursHaptic = Settings.System.getIntForUser(mContext.getContentResolver(),
- Settings.System.QUIET_HOURS_HAPTIC, 0, UserHandle.USER_CURRENT) != 0;
+ Settings.System.QUIET_HOURS_HAPTIC, 0, UserHandle.USER_CURRENT_OR_SELF) != 0;
if (quietHoursEnabled && quietHoursHaptic && (quietHoursStart != quietHoursEnd)) {
// Get the date in "quiet hours" format.
Calendar calendar = Calendar.getInstance();