Commit 9162686e authored by Artem Bolgar's avatar Artem Bolgar Committed by Commit Bot

Adding a nullcheck into WinowAndroid.setPreferredRefreshRate.

We are getting a crash in org.chromium.ui.base.WindowAndroid.setPreferredRefreshRate because getWindow() returns null and there is no nullcheck there. getWindow() CAN return null when there is no activity (and this is exactly our case, Oculus Browser is not using Activity). There are getWindow() nullchecks in other methods of WindowAndroid, but not in setPreferredRefreshRate which looks as oversight.

Bug: 1085160
Change-Id: I6cbeac08787f9664abd4fdb2e619e100a09fa943
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2210673Reviewed-by: default avatarBo <boliu@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770793}
parent 27431f2b
...@@ -946,6 +946,7 @@ public class WindowAndroid implements AndroidPermissionDelegate, DisplayAndroidO ...@@ -946,6 +946,7 @@ public class WindowAndroid implements AndroidPermissionDelegate, DisplayAndroidO
int preferredModeId = getPreferredModeId(preferredRefreshRate); int preferredModeId = getPreferredModeId(preferredRefreshRate);
Window window = getWindow(); Window window = getWindow();
if (window == null) return;
WindowManager.LayoutParams params = window.getAttributes(); WindowManager.LayoutParams params = window.getAttributes();
if (params.preferredDisplayModeId == preferredModeId) return; if (params.preferredDisplayModeId == preferredModeId) return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment