From 43a5d87023c83e582ecb41a7b6c580cda9d99734 Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <kevin.f.haggerty@gmail.com>
Date: Mon, 18 Jul 2016 22:21:29 -0600
Subject: [PATCH] DisplayModeControl: Add null check to setMode()

* getCurrentMode() can return null. Don't let setMode() try set a
  null mode because bad things happen.
* Let's make cmhw safe again (groan, I know that one was bad)

Change-Id: I20bdee4a0e8cbb0598f35770d71902332db51ddb
---
 cmhw/org/cyanogenmod/hardware/DisplayModeControl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cmhw/org/cyanogenmod/hardware/DisplayModeControl.java b/cmhw/org/cyanogenmod/hardware/DisplayModeControl.java
index c60027fd..3f2491db 100644
--- a/cmhw/org/cyanogenmod/hardware/DisplayModeControl.java
+++ b/cmhw/org/cyanogenmod/hardware/DisplayModeControl.java
@@ -113,6 +113,10 @@ public class DisplayModeControl {
      * if this mode is valid.
      */
     public static boolean setMode(DisplayMode mode, boolean makeDefault) {
+        if (mode == null) {
+            return false;
+        }
+
         boolean success = FileUtils.writeLine(MODE_PATH, String.valueOf(mode.id));
         if (success && makeDefault) {
             return FileUtils.writeLine(DEFAULT_PATH, String.valueOf(mode.id));