diff options
| author | 2017-01-04 19:35:10 +0000 | |
|---|---|---|
| committer | 2017-01-04 19:35:14 +0000 | |
| commit | f2acf9df65e208e4ca9eb17fb8c5e0d7ec4ab41e (patch) | |
| tree | 7bcc8e3e0740c0d599a3540fbcadb3724b4fe0e5 | |
| parent | e6a0583bc37d1c5083ec594a91cd4ecafa242ab3 (diff) | |
| parent | e40fb27f32bc3717c006267f48231c4e62d7bb07 (diff) | |
Merge "Fix custom pointer icon caching in ViewRootImpl"
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 4f2020311ff4..dc691debc2ef 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -4552,8 +4552,8 @@ public final class ViewRootImpl implements ViewParent, if (mPointerIconType != pointerType) { mPointerIconType = pointerType; + mCustomPointerIcon = null; if (mPointerIconType != PointerIcon.TYPE_CUSTOM) { - mCustomPointerIcon = null; InputManager.getInstance().setPointerIconType(pointerType); return true; } |