Permalink
Browse files

Merge "QuietHours: Change Logic (1/2)" into jb-mr1

  • Loading branch information...
2 parents b5ce695 + 4a901f3 commit c2cc224b8c24b04d3449c3ef53fb160d770c3148 @sethyx sethyx committed with Gerrit Code Review Jul 16, 2013
Showing with 4 additions and 1 deletion.
  1. +4 −1 src/com/android/phone/Ringer.java
@@ -389,7 +389,10 @@ private boolean inQuietHours() {
Settings.System.QUIET_HOURS_END, 0);
boolean quietHoursRinger = Settings.System.getInt(mContext.getContentResolver(),
Settings.System.QUIET_HOURS_RINGER, 0) != 0;
- if (quietHoursEnabled && quietHoursRinger && (quietHoursStart != quietHoursEnd)) {
+ if (quietHoursEnabled && quietHoursRinger) {
+ if (quietHoursStart == quietHoursEnd) {
+ return true;
+ }
// Get the date in "quiet hours" format.
Calendar calendar = Calendar.getInstance();
int minutes = calendar.get(Calendar.HOUR_OF_DAY) * 60 + calendar.get(Calendar.MINUTE);

0 comments on commit c2cc224

Please sign in to comment.