From 71377a4ae2d52494f19f15a0a1b860e356e80caa Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Tue, 14 Feb 2017 18:16:11 -0800 Subject: [PATCH] Enable auto-fill when activity is marked as FLAG_SECURE. BUG: 34077687 Test: CtsAutoFillServiceTestCases passes Change-Id: I2d7a565a53a32792d6daeceba3f3a7beebdf052c --- core/java/android/app/assist/AssistStructure.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/core/java/android/app/assist/AssistStructure.java b/core/java/android/app/assist/AssistStructure.java index 08aa5f2589bf2..6591fc9671f51 100644 --- a/core/java/android/app/assist/AssistStructure.java +++ b/core/java/android/app/assist/AssistStructure.java @@ -420,18 +420,17 @@ public class AssistStructure implements Parcelable { mRoot = new ViewNode(); ViewNodeBuilder builder = new ViewNodeBuilder(assist, mRoot, false, 0); - if ((root.getWindowFlags()& WindowManager.LayoutParams.FLAG_SECURE) != 0) { - // This is a secure window, so it doesn't want a screenshot, and that - // means we should also not copy out its view hierarchy. - + if ((root.getWindowFlags() & WindowManager.LayoutParams.FLAG_SECURE) != 0) { if (forAutoFill) { // NOTE: flags are currently not supported, hence 0 view.onProvideAutoFillStructure(builder, 0); } else { + // This is a secure window, so it doesn't want a screenshot, and that + // means we should also not copy out its view hierarchy for Assist view.onProvideStructure(builder); + builder.setAssistBlocked(true); + return; } - builder.setAssistBlocked(true); - return; } if (forAutoFill) { // NOTE: flags are currently not supported, hence 0