Revert "Revert "Add null check for vrManager""

This reverts commit 122d844516.

Bug: 112064298
Change-Id: Id38ab76ed100358adc03d189373432c03471bcaf
This commit is contained in:
Rick Yiu
2018-09-12 03:48:13 +00:00
parent 122d844516
commit 483befe0b7

View File

@@ -732,10 +732,12 @@ public class StatusBar extends SystemUI implements DemoMode,
IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService(
Context.VR_SERVICE));
try {
vrManager.registerListener(mVrStateCallbacks);
} catch (RemoteException e) {
Slog.e(TAG, "Failed to register VR mode state listener: " + e);
if (vrManager != null) {
try {
vrManager.registerListener(mVrStateCallbacks);
} catch (RemoteException e) {
Slog.e(TAG, "Failed to register VR mode state listener: " + e);
}
}
IWallpaperManager wallpaperManager = IWallpaperManager.Stub.asInterface(