PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-10-10 17:46:55 +00:00
committed by Android (Google) Code Review
parent 31703ca227 0732628bf7
commit c9e2d80ade
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/display/BrightnessLevelPreferenceController.java
View File

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

6
tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
View File

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