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

am 507bd53a: Merge "Do not report the fake UI automation service to clients." into jb-mr2-dev

Browse Source 
* commit '507bd53aa8906f7f3297684edb485706a4a573a1':
  Do not report the fake UI automation service to clients.
This commit is contained in:
Svetoslav Ganov
2013-05-20 16:38:20 -07:00
committed by Android Git Automerger
parent 8ff86240dc 507bd53aa8
commit 20b3b743c0
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,6 +95,7 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -405,7 +406,17 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
synchronized (mLock) {
final int resolvedUserId = mSecurityPolicy
.resolveCallingUserIdEnforcingPermissionsLocked(userId);
return getUserStateLocked(resolvedUserId).mInstalledServices;
// The automation service is a fake one and should not be reported
// to clients as being installed - it really is not.
UserState userState = getUserStateLocked(resolvedUserId);
if (userState.mUiAutomationService != null) {
List<AccessibilityServiceInfo> installedServices =
new ArrayList<AccessibilityServiceInfo>();
installedServices.addAll(userState.mInstalledServices);
installedServices.remove(userState.mUiAutomationService);
return installedServices;
}
return userState.mInstalledServices;
}
}
@@ -415,9 +426,18 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
synchronized (mLock) {
final int resolvedUserId = mSecurityPolicy
.resolveCallingUserIdEnforcingPermissionsLocked(userId);
// The automation service is a fake one and should not be reported
// to clients as being enabled. The automation service is always the
// only active one, if it exists.
UserState userState = getUserStateLocked(resolvedUserId);
if (userState.mUiAutomationService != null) {
return Collections.emptyList();
}
result = mEnabledServicesForFeedbackTempList;
result.clear();
List<Service> services = getUserStateLocked(resolvedUserId).mBoundServices;
List<Service> services = userState.mBoundServices;
while (feedbackType != 0) {
final int feedbackTypeBit = (1 << Integer.numberOfTrailingZeros(feedbackType));
feedbackType &= ~feedbackTypeBit;