Merge "Fixing gradle complain on skipping constructor method mid-way" into sc-dev
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenLockIconController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenLockIconController.java
index 4b70de9..7011eee 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenLockIconController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenLockIconController.java
@@ -127,11 +127,9 @@
         mResources = resources;
         mHeadsUpManagerPhone = headsUpManagerPhone;
 
-        if (view == null) {
-            return;
+        if (view != null) {
+            mKeyguardIndicationController.setLockIconController(this);
         }
-
-        mKeyguardIndicationController.setLockIconController(this);
     }
 
     @Override