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

Merge "Fixing a regression I have introduced."

Browse Source
This commit is contained in:
Svetoslav Ganov
2012-04-16 19:30:45 -07:00
committed by Android (Google) Code Review
parent 14c92b8f84 31725b3f38
commit 55a28720fe
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1004,14 +1004,16 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
mNotificationTimeout = info.notificationTimeout;
mIsDefault = (info.flags & DEFAULT) != 0;
final int targetSdkVersion =
info.getResolveInfo().serviceInfo.applicationInfo.targetSdkVersion;
// TODO: Uncomment this line and remove the line below when JellyBean
// SDK version is finalized.
// if (targetSdkVersion >= Build.VERSION_CODES.JELLY_BEAN) {
if (targetSdkVersion > Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
mIncludeNotImportantViews =
(info.flags & INCLUDE_NOT_IMPORTANT_VIEWS) != 0;
if (!mIsAutomation) {
final int targetSdkVersion =
info.getResolveInfo().serviceInfo.applicationInfo.targetSdkVersion;
// TODO: Uncomment this line and remove the line below when JellyBean
// SDK version is finalized.
// if (targetSdkVersion >= Build.VERSION_CODES.JELLY_BEAN) {
if (targetSdkVersion > Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
mIncludeNotImportantViews =
(info.flags & INCLUDE_NOT_IMPORTANT_VIEWS) != 0;
}
}
synchronized (mLock) {