Commit bafe7cd2 authored by Donn Denman's avatar Donn Denman Committed by Commit Bot

[TTS] Fix a new NPE on Context in IPH.

Check the context for being null.
Also make a few members final.

BUG=1123514

Change-Id: Iade8ec0318464ef1e190aae46da1b8c6634be76a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2386199
Auto-Submit: Donn Denman <donnd@chromium.org>
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Reviewed-by: default avatarJinsuk Kim <jinsukkim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803610}
parent 3a85024b
...@@ -12,6 +12,7 @@ import android.view.ViewGroup; ...@@ -12,6 +12,7 @@ import android.view.ViewGroup;
import android.view.ViewTreeObserver; import android.view.ViewTreeObserver;
import android.view.ViewTreeObserver.OnGlobalFocusChangeListener; import android.view.ViewTreeObserver.OnGlobalFocusChangeListener;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
...@@ -128,18 +129,19 @@ public class ContextualSearchManager ...@@ -128,18 +129,19 @@ public class ContextualSearchManager
*/ */
private final ContextualSearchInteractionRecorder mInteractionRecorder; private final ContextualSearchInteractionRecorder mInteractionRecorder;
@VisibleForTesting
protected final ContextualSearchTranslation mTranslateController;
private final ContextualSearchSelectionClient mContextualSearchSelectionClient; private final ContextualSearchSelectionClient mContextualSearchSelectionClient;
private final ContextualSearchIPH mInProductHelp;
private final ScrimCoordinator mScrimCoordinator; private final ScrimCoordinator mScrimCoordinator;
private ContextualSearchSelectionController mSelectionController; private ContextualSearchSelectionController mSelectionController;
private ContextualSearchNetworkCommunicator mNetworkCommunicator; private ContextualSearchNetworkCommunicator mNetworkCommunicator;
@NonNull
private ContextualSearchPolicy mPolicy; private ContextualSearchPolicy mPolicy;
private ContextualSearchInternalStateController mInternalStateController; private ContextualSearchInternalStateController mInternalStateController;
@VisibleForTesting
protected ContextualSearchTranslation mTranslateController;
// The Overlay panel. // The Overlay panel.
private ContextualSearchPanel mSearchPanel; private ContextualSearchPanel mSearchPanel;
...@@ -151,7 +153,6 @@ public class ContextualSearchManager ...@@ -151,7 +153,6 @@ public class ContextualSearchManager
private OverlayPanelContentViewDelegate mSearchContentViewDelegate; private OverlayPanelContentViewDelegate mSearchContentViewDelegate;
private TabModelSelectorTabModelObserver mTabModelObserver; private TabModelSelectorTabModelObserver mTabModelObserver;
private TabModelSelectorTabObserver mTabModelSelectorTabObserver; private TabModelSelectorTabObserver mTabModelSelectorTabObserver;
private ContextualSearchIPH mInProductHelp;
private boolean mDidStartLoadingResolvedSearchRequest; private boolean mDidStartLoadingResolvedSearchRequest;
private long mLoadedSearchUrlTimeMs; private long mLoadedSearchUrlTimeMs;
...@@ -1258,7 +1259,7 @@ public class ContextualSearchManager ...@@ -1258,7 +1259,7 @@ public class ContextualSearchManager
mInProductHelp.onPanelFinishedShowing(mWasActivatedByTap, profile); mInProductHelp.onPanelFinishedShowing(mWasActivatedByTap, profile);
// Try to figure out the language of the selection and show an IPH if a translation // Try to figure out the language of the selection and show an IPH if a translation
// is needed. // is needed.
if (mPolicy.isUserUndecided() if (mContext != null && mPolicy.isUserUndecided()
&& mTranslateController.needsTranslation(mContext.getDetectedLanguage())) { && mTranslateController.needsTranslation(mContext.getDetectedLanguage())) {
mInProductHelp.onTranslationNeeded(profile); mInProductHelp.onTranslationNeeded(profile);
} }
......
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