commit 28a9d5e4dc8fe1e1b1e523244086a2c694559632
author Android Build Merger (Role) <android-build-merger@google.com> Wed Aug 16 17:42:15 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 16 17:42:15 2017 +0000
tree 138665617e205665a10f952183a836b8f2dc780a
parent 5eb8bfdd159cd6c31bb835e0cd78b96eac7d219a
parent 05cb28a48e87f4cff6bd539391510e99e755dee3

Merge "Merge "Fixes quick switch animations for low end devices" into oc-mr1-dev am: 0877b99aaf am: c9e95c66f4"

core/tests/coretests/src/android/view/DisabledTest.java

diff --git a/core/tests/coretests/src/android/view/DisabledTest.java b/core/tests/coretests/src/android/view/DisabledTest.java
index d78e5e9..291a11c 100644
--- a/core/tests/coretests/src/android/view/DisabledTest.java
+++ b/core/tests/coretests/src/android/view/DisabledTest.java
@@ -78,7 +78,7 @@
         assertNotNull(mDisabledParent);
         assertFalse(mDisabled.isEnabled());
         assertTrue(mDisabledParent.isEnabled());
-        assertTrue(mDisabled.hasFocus());
+        assertFalse(mDisabled.hasFocus());
     }
 
     @MediumTest