Merge "Add null check for vrManager" into pi-dev

am: c9e2d80ade

Change-Id: Ifb1f2da7e3493e91f26735e7609c4480b1f0f346

src/com/android/settings/display/BrightnessLevelPreferenceController.java

@@ -150,14 +150,22 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr
         return (value - min) / (max - min);
     }
 
+    @VisibleForTesting
+    IVrManager safeGetVrManager() {
+        return IVrManager.Stub.asInterface(ServiceManager.getService(
+                Context.VR_SERVICE));
+    }
+
     @VisibleForTesting
     boolean isInVrMode() {
+        IVrManager vrManager = safeGetVrManager();
+        if (vrManager != null) {
             try {
-            return IVrManager.Stub.asInterface(ServiceManager.getService(Context.VR_SERVICE))
+                return vrManager.getVrModeState();
-                    .getVrModeState();
             } catch (RemoteException e) {
                 Log.e(TAG, "Failed to check vr mode!", e);
             }
+        }
         return false;
     }
 }

tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java

@@ -81,6 +81,12 @@ public class BrightnessLevelPreferenceControllerTest {
         assertThat(mController.isAvailable()).isTrue();
     }
 
+    @Test
+    public void isInVrMode_noVrManager_shouldAlwaysReturnFalse() {
+        doReturn(null).when(mController).safeGetVrManager();
+        assertThat(mController.isInVrMode()).isFalse();
+    }
+
     @Test
     public void onStart_shouldRegisterObserver() {
         BrightnessLevelPreferenceController controller =