diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-02-23 03:39:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-23 03:39:53 +0000 |
| commit | 370b0da014fcdceb06078c621c3bbc63e15d049f (patch) | |
| tree | 9e6390a152663e2d7ed8a34d7dede3539f4a468d /core/java | |
| parent | 05675bc0cfa09ef7bb5e310b7d9f324af32021bf (diff) | |
| parent | a4c520694fee942a6a166bbb6687dcd0ea0e3509 (diff) | |
Merge "Fix View#performHapticFeedback() can block UI thread"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/IWindowSession.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/IWindowSession.aidl b/core/java/android/view/IWindowSession.aidl index 658f06ad21f9..240aad5a0c56 100644 --- a/core/java/android/view/IWindowSession.aidl +++ b/core/java/android/view/IWindowSession.aidl @@ -148,7 +148,7 @@ interface IWindowSession { void setInTouchMode(boolean showFocus); boolean getInTouchMode(); - boolean performHapticFeedback(IWindow window, int effectId, boolean always); + boolean performHapticFeedback(int effectId, boolean always); /** * Initiate the drag operation itself 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; } |