Commit 1dd99e49 authored by Bo Liu's avatar Bo Liu Committed by Commit Bot

android: Catch exception in broken OS implementations

Some bad OS implementation throw null pointer exception here. Just catch
and ignore it.

Bug: 1092978
Change-Id: Ia465e6198645c2ff0e5c30b0e3c45eccf6f0508b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2238451
Commit-Queue: Bo <boliu@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#776700}
parent 0af0e02f
...@@ -34,6 +34,7 @@ import androidx.core.view.accessibility.AccessibilityEventCompat; ...@@ -34,6 +34,7 @@ import androidx.core.view.accessibility.AccessibilityEventCompat;
import androidx.core.view.inputmethod.EditorInfoCompat; import androidx.core.view.inputmethod.EditorInfoCompat;
import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.base.Log;
import org.chromium.base.ThreadUtils; import org.chromium.base.ThreadUtils;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.tab.EmptyTabObserver; import org.chromium.chrome.browser.tab.EmptyTabObserver;
...@@ -725,7 +726,12 @@ public class FindToolbar extends LinearLayout { ...@@ -725,7 +726,12 @@ public class FindToolbar extends LinearLayout {
} else { } else {
mSearchKeyShouldTriggerSearch = false; mSearchKeyShouldTriggerSearch = false;
} }
mFindQuery.setText(findText); try {
mFindQuery.setText(findText);
} catch (NullPointerException e) {
// See crbug.com/1092978.
Log.w(TAG, "ignoring exception in setText", e);
}
mSettingFindTextProgrammatically = false; mSettingFindTextProgrammatically = false;
} }
......
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