From a5c863b58ec4b8f6f0d51138d2f3d5092e0c76ef Mon Sep 17 00:00:00 2001
From: Sam Dubey <dubeyshubham@google.com>
Date: Sun, 28 Aug 2022 07:16:01 +0000
Subject: [PATCH] Add null check to virtual device manager

Some tv targets are failing to boot after Ie10dbfe65bb3ab9d62ed5c7b5ed7095a51bccf24 with a null pointer on vdm. Adding null check.

Bug: 244116059
Bug: 244121297
Test: Forrest

Change-Id: Idb298213df6ddfda027fd51d0d532f0fcf47d32b
---
 .../java/com/android/server/vibrator/VibrationSettings.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/vibrator/VibrationSettings.java b/services/core/java/com/android/server/vibrator/VibrationSettings.java
index d7bfd1deca909..fcf0a904b8087 100644
--- a/services/core/java/com/android/server/vibrator/VibrationSettings.java
+++ b/services/core/java/com/android/server/vibrator/VibrationSettings.java
@@ -263,8 +263,10 @@ final class VibrationSettings {
                     }
                 });
 
-        vdm.registerVirtualDisplayListener(mVirtualDeviceListener);
-        vdm.registerAppsOnVirtualDeviceListener(mVirtualDeviceListener);
+        if (vdm != null){
+          vdm.registerVirtualDisplayListener(mVirtualDeviceListener);
+          vdm.registerAppsOnVirtualDeviceListener(mVirtualDeviceListener);
+        }
 
         registerSettingsChangeReceiver(USER_SWITCHED_INTENT_FILTER);
         registerSettingsChangeReceiver(INTERNAL_RINGER_MODE_CHANGED_INTENT_FILTER);