Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up UiAutomation working alongside a11y." into nyc-dev

Browse Source
This commit is contained in:
Phil Weaver
2016-02-09 16:59:25 +00:00
committed by Android (Google) Code Review
parent c61e102474 f564afa4cd
commit cc494765fa
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/app/Instrumentation.java
View File

@@ -1842,13 +1842,10 @@ public class Instrumentation {
* @see UiAutomation * @see UiAutomation
*/ */
public UiAutomation getUiAutomation() { public UiAutomation getUiAutomation() {
if (mUiAutomationConnection != null) { if ((mUiAutomation == null) || (mUiAutomation.isDestroyed())) {
if (mUiAutomation == null) { return getUiAutomation(0);
return getUiAutomation(0);
}
return mUiAutomation;
} }
return null; return mUiAutomation;
} }
/** /**

3
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -52,7 +52,6 @@ import android.net.Uri;
import android.os.Binder; import android.os.Binder;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Debug;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.Looper; import android.os.Looper;
@@ -654,7 +653,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
userState.mUiAutomationFlags = flags; userState.mUiAutomationFlags = flags;
userState.mIsAccessibilityEnabled = true; userState.mIsAccessibilityEnabled = true;
userState.mInstalledServices.add(accessibilityServiceInfo); userState.mInstalledServices.add(accessibilityServiceInfo);
if (userState.isUiAutomationSuppressingOtherServices()) { if ((flags & UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES) == 0) {
// Set the temporary state. // Set the temporary state.
userState.mIsTouchExplorationEnabled = false; userState.mIsTouchExplorationEnabled = false;
userState.mIsEnhancedWebAccessibilityEnabled = false; userState.mIsEnhancedWebAccessibilityEnabled = false;