commit c5aaf45be4d8703ba7f14fa07fac63325ebd1831
author Lucas Dupin <dupin@google.com> Thu Sep 20 16:10:07 2018 -0700
committer Lucas Dupin <dupin@google.com> Mon Nov 12 19:38:41 2018 +0000
tree 7f60acf02f86ba8ad0802e53abe0b929762d6087
parent d5180a5ec2ca69d48c468be8b2bb35ded12c50f2

Restricting UiModeManager#setNightMode

Apps have been trying to set their night modes by calling this
function but they end up toggling the system-wide UiMode.

From now on, an error message will be logged if the app doesn't
hold the right permission.

Change-Id: Ie62c870b84190a62321a05a007cd2bf3dc9851f8
Fixes: 113605757
Test: manual. open app that tries to trigger night mode

services/core/java/com/android/server/UiModeManagerService.java

diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java
index cb03255..01be691 100644
--- a/services/core/java/com/android/server/UiModeManagerService.java
+++ b/services/core/java/com/android/server/UiModeManagerService.java
@@ -303,11 +303,10 @@
 
         @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) {