diff options
| author | 2018-11-12 21:38:07 +0000 | |
|---|---|---|
| committer | 2018-11-12 21:38:07 +0000 | |
| commit | 1ca41c72991f1602cc7258e722f4b12dee93bf9a (patch) | |
| tree | 5b393155cab2c2c1286d6a259b7f4632b1ebde6c | |
| parent | 035d291240804b754f2be381a2b230ae3a181e75 (diff) | |
| parent | c5aaf45be4d8703ba7f14fa07fac63325ebd1831 (diff) | |
Merge "Restricting UiModeManager#setNightMode"
| -rw-r--r-- | core/res/res/values/config.xml | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/UiModeManagerService.java | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 6a355edcf2b3..6ae183b99942 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -906,7 +906,7 @@ <!-- Control whether to lock day/night mode change from normal application. When it is true, day / night mode change is only allowed to apps with MODIFY_DAY_NIGHT_MODE permission. --> - <bool name="config_lockDayNightMode">false</bool> + <bool name="config_lockDayNightMode">true</bool> <!-- Control the default night mode to use when there is no other mode override set. One of the following values (see UiModeManager.java): diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java index 5538e72703e9..cb9d4c62ab7a 100644 --- a/services/core/java/com/android/server/UiModeManagerService.java +++ b/services/core/java/com/android/server/UiModeManagerService.java @@ -300,11 +300,10 @@ final class UiModeManagerService extends SystemService { @Override public void setNightMode(int mode) { - if (isNightModeLocked() && (getContext().checkCallingOrSelfPermission( + if (isNightModeLocked() && (getContext().checkCallingOrSelfPermission( android.Manifest.permission.MODIFY_DAY_NIGHT_MODE) != PackageManager.PERMISSION_GRANTED)) { - Slog.e(TAG, - "Night mode locked, requires MODIFY_DAY_NIGHT_MODE permission"); + Slog.e(TAG, "Night mode locked, requires MODIFY_DAY_NIGHT_MODE permission"); return; } switch (mode) { |