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

Merge "[DO NOT MERGE] Eliminate duplicate layers in A11yService#getWindows()" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-20 21:46:40 +00:00
committed by Android (Google) Code Review
parent e649106c74 18e7fc1114
commit fa23f8e30e
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/util/DebugUtils.java
View File

@@ -219,7 +219,7 @@ public class DebugUtils {
&& field.getType().equals(int.class) && field.getName().startsWith(prefix)) {
try {
if (value == field.getInt(null)) {
return field.getName().substring(prefix.length());
return constNameWithoutPrefix(prefix, field);
}
} catch (IllegalAccessException ignored) {
}
@@ -236,6 +236,7 @@ public class DebugUtils {
*/
public static String flagsToString(Class<?> clazz, String prefix, int flags) {
final StringBuilder res = new StringBuilder();
boolean flagsWasZero = flags == 0;
for (Field field : clazz.getDeclaredFields()) {
final int modifiers = field.getModifiers();
@@ -243,9 +244,12 @@ public class DebugUtils {
&& field.getType().equals(int.class) && field.getName().startsWith(prefix)) {
try {
final int value = field.getInt(null);
if (value == 0 && flagsWasZero) {
return constNameWithoutPrefix(prefix, field);
}
if ((flags & value) != 0) {
flags &= ~value;
res.append(field.getName().substring(prefix.length())).append('|');
res.append(constNameWithoutPrefix(prefix, field)).append('|');
}
} catch (IllegalAccessException ignored) {
}
@@ -258,4 +262,8 @@ public class DebugUtils {
}
return res.toString();
}
private static String constNameWithoutPrefix(String prefix, Field field) {
return field.getName().substring(prefix.length());
}
}

20
services/core/java/com/android/server/wm/AccessibilityController.java
View File

@@ -1096,10 +1096,7 @@ final class AccessibilityController {
// Add windows of certain types not covered by modal windows.
if (isReportedWindowType(windowState.mAttrs.type)) {
// Add the window to the ones to be reported.
WindowInfo window = obtainPopulatedWindowInfo(windowState, boundsInScreen);
window.layer = addedWindows.size();
addedWindows.add(window.token);
windows.add(window);
addPopulatedWindowInfo(windowState, boundsInScreen, windows, addedWindows);
if (windowState.isFocused()) {
focusedWindowAdded = true;
}
@@ -1150,10 +1147,8 @@ final class AccessibilityController {
computeWindowBoundsInScreen(windowState, boundsInScreen);
// Add the window to the ones to be reported.
WindowInfo window = obtainPopulatedWindowInfo(windowState,
boundsInScreen);
addedWindows.add(window.token);
windows.add(window);
addPopulatedWindowInfo(
windowState, boundsInScreen, windows, addedWindows);
break;
}
}
@@ -1244,11 +1239,14 @@ final class AccessibilityController {
(int) windowFrame.right, (int) windowFrame.bottom);
}
private static WindowInfo obtainPopulatedWindowInfo(
WindowState windowState, Rect boundsInScreen) {
private static void addPopulatedWindowInfo(
WindowState windowState, Rect boundsInScreen,
List<WindowInfo> out, Set<IBinder> tokenOut) {
final WindowInfo window = windowState.getWindowInfo();
window.boundsInScreen.set(boundsInScreen);
return window;
window.layer = tokenOut.size();
out.add(window);
tokenOut.add(window.token);
}
private void cacheWindows(List<WindowInfo> windows) {