Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46e14284 authored by DvTonder's avatar DvTonder Committed by Ricardo Cerqueira
Browse files

Framework: Fix security exception 

Change-Id: I4fa1f55c8209e6890b6cea13b0ed4d781f9f615d
parent c196ba6a

services/java/com/android/server/BatteryService.java

+4 −4
Original line number Diff line number Diff line
@@ -852,13 +852,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();

        }

services/java/com/android/server/NotificationManagerService.java

+6 −6
Original line number Diff line number Diff line
@@ -1380,17 +1380,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;

        }

    }

services/java/com/android/server/VibratorService.java

+4 −4
Original line number Diff line number Diff line
@@ -194,13 +194,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();