From ba4db5ad368befda4c135dde75132fef83414dec Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Thu, 20 Aug 2015 01:52:29 -0700
Subject: [PATCH] cmhw: Add makeDefault arg to setDisplayMode

 * Already supported by the HAL and is necessary to sync state with
   the server side.

Change-Id: I65148d5464dff8dbbee374387a01bcf13a945eb1
---
 .../platform/internal/CMHardwareService.java           | 10 +++++-----
 src/java/cyanogenmod/hardware/CMHardwareManager.java   |  4 ++--
 src/java/cyanogenmod/hardware/ICMHardwareService.aidl  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMHardwareService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMHardwareService.java
index 512449d6..67fd5a3c 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMHardwareService.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMHardwareService.java
@@ -78,7 +78,7 @@ public class CMHardwareService extends SystemService {
         public DisplayMode[] getDisplayModes();
         public DisplayMode getCurrentDisplayMode();
         public DisplayMode getDefaultDisplayMode();
-        public boolean setDisplayMode(DisplayMode mode);
+        public boolean setDisplayMode(DisplayMode mode, boolean makeDefault);
     }
 
     private class LegacyCMHardware implements CMHardwareInterface {
@@ -290,8 +290,8 @@ public class CMHardwareService extends SystemService {
             return DisplayModeControl.getDefaultMode();
         }
 
-        public boolean setDisplayMode(DisplayMode mode) {
-            return DisplayModeControl.setMode(mode, true);
+        public boolean setDisplayMode(DisplayMode mode, boolean makeDefault) {
+            return DisplayModeControl.setMode(mode, makeDefault);
         }
     }
 
@@ -515,14 +515,14 @@ public class CMHardwareService extends SystemService {
         }
 
         @Override
-        public boolean setDisplayMode(DisplayMode mode) {
+        public boolean setDisplayMode(DisplayMode mode, boolean makeDefault) {
             mContext.enforceCallingOrSelfPermission(
                     cyanogenmod.platform.Manifest.permission.HARDWARE_ABSTRACTION_ACCESS, null);
             if (!isSupported(CMHardwareManager.FEATURE_DISPLAY_MODES)) {
                 Log.e(TAG, "Display modes are not supported");
                 return false;
             }
-            return mCmHwImpl.setDisplayMode(mode);
+            return mCmHwImpl.setDisplayMode(mode, makeDefault);
         }
     };
 }
diff --git a/src/java/cyanogenmod/hardware/CMHardwareManager.java b/src/java/cyanogenmod/hardware/CMHardwareManager.java
index 7c95767f..214f885f 100644
--- a/src/java/cyanogenmod/hardware/CMHardwareManager.java
+++ b/src/java/cyanogenmod/hardware/CMHardwareManager.java
@@ -578,9 +578,9 @@ public final class CMHardwareManager {
     /**
      * @return true if setting the mode was successful
      */
-    public boolean setDisplayMode(DisplayMode mode) {
+    public boolean setDisplayMode(DisplayMode mode, boolean makeDefault) {
         try {
-            return getService().setDisplayMode(mode);
+            return getService().setDisplayMode(mode, makeDefault);
         } catch (RemoteException e) {
         }
         return false;
diff --git a/src/java/cyanogenmod/hardware/ICMHardwareService.aidl b/src/java/cyanogenmod/hardware/ICMHardwareService.aidl
index 87d6de89..44738e3f 100644
--- a/src/java/cyanogenmod/hardware/ICMHardwareService.aidl
+++ b/src/java/cyanogenmod/hardware/ICMHardwareService.aidl
@@ -46,5 +46,5 @@ interface ICMHardwareService {
     DisplayMode[] getDisplayModes();
     DisplayMode getCurrentDisplayMode();
     DisplayMode getDefaultDisplayMode();
-    boolean setDisplayMode(in DisplayMode mode);
+    boolean setDisplayMode(in DisplayMode mode, boolean makeDefault);
 }