diff options
| author | Kevin F. Haggerty <kevin.f.haggerty@gmail.com> | 2016-07-18 22:21:29 -0600 |
|---|---|---|
| committer | Kevin F. Haggerty <kevin.f.haggerty@gmail.com> | 2016-07-19 06:44:59 -0600 |
| commit | 43a5d87023c83e582ecb41a7b6c580cda9d99734 (patch) | |
| tree | 77ef99aed0a70b9fde447eee86e567786707385f | |
| parent | ffcfb9f6acf86f0c56e11e0b4f4417b5563d4310 (diff) | |
| download | android_hardware_samsung-43a5d87023c83e582ecb41a7b6c580cda9d99734.tar.gz android_hardware_samsung-43a5d87023c83e582ecb41a7b6c580cda9d99734.tar.bz2 android_hardware_samsung-43a5d87023c83e582ecb41a7b6c580cda9d99734.zip | |
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
| -rw-r--r-- | cmhw/org/cyanogenmod/hardware/DisplayModeControl.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmhw/org/cyanogenmod/hardware/DisplayModeControl.java b/cmhw/org/cyanogenmod/hardware/DisplayModeControl.java index c60027f..3f2491d 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)); |