Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43215fbb authored by Daniel Norman's avatar Daniel Norman
Browse files

Don't default accessibilityDataPrivate when the window is FLAG_SECURE. 

Bug: 240199303
Test: n/a (upcoming tests for this feature were abandoned)
Change-Id: I89ee014d05142e1fbdbb2badcfff54ddd91f6926
parent 9b34631e

core/java/android/view/View.java

+0 −9
Original line number Diff line number Diff line
@@ -3093,7 +3093,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * <p>

     * Accessibility interactions from services without {@code isAccessibilityTool} set to true are

     * disallowed for any of the following conditions:

     * <li>this view's window sets {@link WindowManager.LayoutParams#FLAG_SECURE}.</li>

     * <li>this view sets {@link #getFilterTouchesWhenObscured()}.</li>

     * <li>any parent of this view returns true from {@link #isAccessibilityDataPrivate()}.</li>

     * </p>
@@ -14507,9 +14506,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        // Use the explicit value if set.

        if (mExplicitAccessibilityDataPrivate != ACCESSIBILITY_DATA_PRIVATE_AUTO) {

            mInferredAccessibilityDataPrivate = mExplicitAccessibilityDataPrivate;

        } else if (mAttachInfo != null && mAttachInfo.mWindowSecure) {

            // Views inside FLAG_SECURE windows default to accessibilityDataPrivate.

            mInferredAccessibilityDataPrivate = ACCESSIBILITY_DATA_PRIVATE_YES;

        } else if (getFilterTouchesWhenObscured()) {

            // Views that set filterTouchesWhenObscured default to accessibilityDataPrivate.

            mInferredAccessibilityDataPrivate = ACCESSIBILITY_DATA_PRIVATE_YES;
@@ -30220,11 +30216,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
         */

        int mWindowVisibility;













        /**













         * Indicates whether the view's window sets {@link WindowManager.LayoutParams#FLAG_SECURE}.













         */













        boolean mWindowSecure;



























        /**















         * Indicates the time at which drawing started to occur.















         */

























core/java/android/view/ViewRootImpl.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -2836,7 +2836,6 @@ public final class ViewRootImpl implements ViewParent,













            // However, windows are now always 32 bits by default, so choose 32 bits















            mAttachInfo.mUse32BitDrawingCache = true;















            mAttachInfo.mWindowVisibility = viewVisibility;













            mAttachInfo.mWindowSecure = (lp.flags & WindowManager.LayoutParams.FLAG_SECURE) != 0;















            mAttachInfo.mRecomputeGlobalAttributes = false;















            mLastConfigurationFromResources.setTo(config);















            mLastSystemUiVisibility = mAttachInfo.mSystemUiVisibility;