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

Merge "Enable auto-fill when activity is marked as FLAG_SECURE."

Browse Source
This commit is contained in:
Felipe Leme
2017-02-15 07:48:45 +00:00
committed by Android (Google) Code Review
parent e0ac9dabc7 71377a4ae2
commit a45eb7eb12
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/app/assist/AssistStructure.java
View File

@@ -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