Merge "Add null check for vrManager" into pi-dev (31e062e6) · Commits · e / os / android_packages_apps_Settings

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

+13 −5

Original line number	Diff line number	Diff line
		@@ -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))
		.getVrModeState();
		return vrManager.getVrModeState();
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to check vr mode!", e);
		}
		}
		return false;
		}
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -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 =