AlexeyBarabash
352dd8ee1e
[Android] Cherry-pick of M147 crash fix at ActivityTabWebContentsDelegateAndroid.java Resolves https://github.com/brave/brave-browser/issues/53285 This is a cherry-pick to fix the crash Original commit: https://source.chromium.org/chromium/chromium/src/+/ad0cd3bfdafd8f641c623a63647066567c1cf234 commit ad0cd3bfdafd8f641c623a63647066567c1cf234 Author: Abdelrahman Eed <abdoeed@google.com> Date: Tue Feb 24 01:29:51 2026 -0800 [ExclusiveAccessManager] Fix crash in 'requestPointerLock' Change assert with a check to fail gracefully in stable if mExclusiveAccessManager is null. Bug: 484081504 Change-Id: I64fd1d3a954d6c0b806c1f5f466d36d4c1dd3f45 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7599042 Reviewed-by: Andrew Grieve <agrieve@chromium.org> Auto-Submit: Abdelrahman Eed <abdoeed@google.com> Commit-Queue: Abdelrahman Eed <abdoeed@google.com> Cr-Commit-Position: refs/heads/main@{#1589245}
24 lines
1.3 KiB
Diff
24 lines
1.3 KiB
Diff
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
|
|
index b540c9b39fb75922bf06a5eea345395445a7cc80..f3e123047548cd670dcae51865cdf0ed2241df61 100644
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
|
|
@@ -739,12 +739,18 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
|
|
public void requestPointerLock(
|
|
WebContents webContents, boolean userGesture, boolean lastUnlockedByTarget) {
|
|
assert mExclusiveAccessManager != null;
|
|
+ if (mExclusiveAccessManager == null) {
|
|
+ return;
|
|
+ }
|
|
mExclusiveAccessManager.requestPointerLock(webContents, userGesture, lastUnlockedByTarget);
|
|
}
|
|
|
|
@Override
|
|
public void lostPointerLock() {
|
|
assert mExclusiveAccessManager != null;
|
|
+ if (mExclusiveAccessManager == null) {
|
|
+ return;
|
|
+ }
|
|
mExclusiveAccessManager.lostPointerLock();
|
|
}
|
|
|