Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE when the vr manager isn\'t around at first." into nyc-dev

Browse Source 
am: 1e79be9

* commit '1e79be9f0a6595cfd3cfadb272e2692197098767':
  Fix NPE when the vr manager isn't around at first.

Change-Id: Ie0af1a0404aee098b4d2c7e3d884ad45bce7543d
This commit is contained in:
Dan Sandler
2016-04-13 19:07:34 +00:00
committed by android-build-merger
parent 8afc15afc7 1e79be9f0a
commit 8bd6f46e58
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/policy/ImmersiveModeConfirmation.java
View File

@@ -80,8 +80,6 @@ public class ImmersiveModeConfirmation {
.getInteger(R.integer.config_immersive_mode_confirmation_panic);
mWindowManager = (WindowManager)
mContext.getSystemService(Context.WINDOW_SERVICE);
mVrManager = (IVrManager) IVrManager.Stub.asInterface(
ServiceManager.getService(VrManagerService.VR_MANAGER_BINDER_SERVICE));
}
private long getNavBarExitDuration() {
@@ -121,11 +119,18 @@ public class ImmersiveModeConfirmation {
private boolean getVrMode() {
boolean vrMode = false;
try {
vrMode = mVrManager.getVrModeState();
} catch (RemoteException ex) { }
if (mVrManager == null) {
// lazily grab this service since it may not be available at construction time
mVrManager = (IVrManager) IVrManager.Stub.asInterface(
ServiceManager.getService(VrManagerService.VR_MANAGER_BINDER_SERVICE));
}
if (mVrManager != null) {
try {
vrMode = mVrManager.getVrModeState();
} catch (RemoteException ex) { }
}
return vrMode;
}
}
public void immersiveModeChanged(String pkg, boolean isImmersiveMode,
boolean userSetupComplete) {