ui/android/java/src/org/chromium/ui/base/TouchDevice.java - Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/android/java/src/org/chromium/ui/base/TouchDevice.java

Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs

Patch Set: Fix error introduced during rebase Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/android/java/src/org/chromium/ui/base/TouchDevice.java

diff --git a/ui/android/java/src/org/chromium/ui/base/TouchDevice.java b/ui/android/java/src/org/chromium/ui/base/TouchDevice.java

index 440e95c8c281fcec789b123113506f856f6fc367..a5fc9793c2752c2fed43b90ce10870519357c7b1 100644

--- a/ui/android/java/src/org/chromium/ui/base/TouchDevice.java

+++ b/ui/android/java/src/org/chromium/ui/base/TouchDevice.java

@@ -57,7 +57,10 @@ public class TouchDevice {

int pointerTypesVal = 0;

for (int deviceId : InputDevice.getDeviceIds()) {

- int sources = InputDevice.getDevice(deviceId).getSources();

+ InputDevice inputDevice = InputDevice.getDevice(deviceId);

+ if (inputDevice == null) continue;

+ int sources = inputDevice.getSources();

if (hasSource(sources, InputDevice.SOURCE_MOUSE)

|| hasSource(sources, InputDevice.SOURCE_STYLUS)

@@ -84,7 +87,10 @@ public class TouchDevice {

int hoverTypesVal = 0;