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

am b8ee636a: am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev

Browse Source 
* commit 'b8ee636a864577c08a53bf4b1ba8120d952eb5d8':
  Accessibility layer in inconsistent state after running UI test automation tests.
This commit is contained in:
Svetoslav Ganov
2012-10-25 11:15:12 -07:00
committed by Android Git Automerger
parent 1cd75be6a7 b8ee636a86
commit 1abaa2cb69
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -558,8 +558,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
public void unregisterUiTestAutomationService(IAccessibilityServiceClient serviceClient) {
synchronized (mLock) {
// Automation service is not bound, so pretend it died to perform clean up.
if (mUiAutomationService != null
&& mUiAutomationService.mServiceInterface == serviceClient) {
if (mUiAutomationService != null && mUiAutomationService.mServiceInterface != null
&& serviceClient != null && mUiAutomationService.mServiceInterface
.asBinder() == serviceClient.asBinder()) {
mUiAutomationService.binderDied();
}
}