summaryrefslogtreecommitdiff
path: root/core/java/android/view/ViewRootImpl.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-02-23 03:39:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-02-23 03:39:53 +0000
commit370b0da014fcdceb06078c621c3bbc63e15d049f (patch)
tree9e6390a152663e2d7ed8a34d7dede3539f4a468d /core/java/android/view/ViewRootImpl.java
parent05675bc0cfa09ef7bb5e310b7d9f324af32021bf (diff)
parenta4c520694fee942a6a166bbb6687dcd0ea0e3509 (diff)
Merge "Fix View#performHapticFeedback() can block UI thread"
Diffstat (limited to 'core/java/android/view/ViewRootImpl.java')
-rw-r--r--core/java/android/view/ViewRootImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 89c67032f8c2..be6b56c209a5 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -6996,7 +6996,7 @@ public final class ViewRootImpl implements ViewParent,
@Override
public boolean performHapticFeedback(int effectId, boolean always) {
try {
- return mWindowSession.performHapticFeedback(mWindow, effectId, always);
+ return mWindowSession.performHapticFeedback(effectId, always);
} catch (RemoteException e) {
return false;
}