commit dd371ec1a84f06a644e8c6f5179fd8bd5f11121b
author Terry Heo <terryheo@google.com> Thu Dec 10 15:31:05 2015 +0900
committer Terry (Woncheol) Heo <terryheo@google.com> Thu Dec 10 06:34:31 2015 +0000
tree e1cb1805be3925a6a5874f6ee2201a6137b540d5
parent 2b69da5183ad9eae662cf2f457153c15ba21f5a3

CEC: Prevent NPE on HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED change

Bug: 25954258
Change-Id: I68a9cf537f2fb7cedb0194562a155b00d83044cb

services/core/java/com/android/server/hdmi/HdmiControlService.java

diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index 11fdb92..459c47f 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -523,7 +523,9 @@
                 case Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED:
                     for (int type : mLocalDevices) {
                         HdmiCecLocalDevice localDevice = mCecController.getLocalDevice(type);
-                        localDevice.setAutoDeviceOff(enabled);
+                        if (localDevice != null) {
+                            localDevice.setAutoDeviceOff(enabled);
+                        }
                     }
                     // No need to propagate to HAL.
                     break;