diff --git a/api/current.txt b/api/current.txt
index 52611e213e8be..fe4451d74a62b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -501,9 +501,9 @@ package android {
     field public static final int entries = 16842930; // 0x10100b2
     field public static final int entryValues = 16843256; // 0x10101f8
     field public static final int eventsInterceptionEnabled = 16843389; // 0x101027d
-    field public static final int excludeClass = 16843854; // 0x101044e
+    field public static final int excludeClass = 16843855; // 0x101044f
     field public static final int excludeFromRecents = 16842775; // 0x1010017
-    field public static final int excludeId = 16843853; // 0x101044d
+    field public static final int excludeId = 16843854; // 0x101044e
     field public static final int exitFadeDuration = 16843533; // 0x101030d
     field public static final int expandableListPreferredChildIndicatorLeft = 16842834; // 0x1010052
     field public static final int expandableListPreferredChildIndicatorRight = 16842835; // 0x1010053
@@ -598,7 +598,7 @@ package android {
     field public static final int headerBackground = 16843055; // 0x101012f
     field public static final int headerDividersEnabled = 16843310; // 0x101022e
     field public static final int height = 16843093; // 0x1010155
-    field public static final int hideOnContentScroll = 16843855; // 0x101044f
+    field public static final int hideOnContentScroll = 16843856; // 0x1010450
     field public static final int hint = 16843088; // 0x1010150
     field public static final int homeAsUpIndicator = 16843531; // 0x101030b
     field public static final int homeLayout = 16843549; // 0x101031d
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index beebeb193d493..db87394a8aaaf 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -2588,10 +2588,6 @@ public final class ViewRootImpl implements ViewParent,
      * @param canvas The canvas on which to draw.
      */
     private void drawAccessibilityFocusedDrawableIfNeeded(Canvas canvas) {
-        if (!mAttachInfo.mHasWindowFocus) {
-            return;
-        }
-
         final AccessibilityManager manager = AccessibilityManager.getInstance(mView.mContext);
         if (!manager.isEnabled() || !manager.isTouchExplorationEnabled()) {
             return;