am 1803e5e5: Merge "Enforcing BIND_ACCESSIBILITY_SERVICE for connecting to an accessibility service." into jb-mr1-dev

* commit '1803e5e5c7bd867462c74c57c19b43422146d8f9':
  Enforcing BIND_ACCESSIBILITY_SERVICE for connecting to an accessibility service.
This commit is contained in:
Svetoslav Ganov
2012-09-12 20:36:17 -07:00
committed by Android Git Automerger

View File

@@ -682,11 +682,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
for (int i = 0, count = installedServices.size(); i < count; i++) { for (int i = 0, count = installedServices.size(); i < count; i++) {
ResolveInfo resolveInfo = installedServices.get(i); ResolveInfo resolveInfo = installedServices.get(i);
ServiceInfo serviceInfo = resolveInfo.serviceInfo; ServiceInfo serviceInfo = resolveInfo.serviceInfo;
// For now we are enforcing this if the target version is JellyBean or if (!android.Manifest.permission.BIND_ACCESSIBILITY_SERVICE.equals(serviceInfo.permission)) {
// higher and in a later release we will enforce this for everyone.
if (serviceInfo.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.JELLY_BEAN
&& !android.Manifest.permission.BIND_ACCESSIBILITY_SERVICE.equals(
serviceInfo.permission)) {
Slog.w(LOG_TAG, "Skipping accessibilty service " + new ComponentName( Slog.w(LOG_TAG, "Skipping accessibilty service " + new ComponentName(
serviceInfo.packageName, serviceInfo.name).flattenToShortString() serviceInfo.packageName, serviceInfo.name).flattenToShortString()
+ ": it does not require the permission " + ": it does not require the permission "