Merge "Fix custom pointer icon caching in ViewRootImpl"

2017-01-04 19:35:10 +00:00
parent e6a0583bc3 e40fb27f32
commit f2acf9df65
1 changed files with 1 additions and 1 deletions
--- 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;
            }