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

Unverified Commit 7c696e2e authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-15.0.0_r7' into staging/lineage-22.1_android-security-15.0.0_r7 

Android security 15.0.0 release 7

* tag 'android-security-15.0.0_r7':
  Fix for SAF loophole in the lastAccessedStack.
  Prevent clickjacking attack in DocsUi.

Change-Id: Iedf8791b46a9a822bdd6920abab59693a669bccf
parents 4d1c3268 28a2a310

src/com/android/documentsui/picker/ActionHandler.java

+3 −0
Original line number Diff line number Diff line
@@ -272,6 +272,9 @@ class ActionHandler<T extends FragmentActivity & Addons> extends AbstractActionH 
    private void onLastAccessedStackLoaded(@Nullable DocumentStack stack) {

        if (stack == null) {

            loadDefaultLocation();

        } else if (shouldPreemptivelyRestrictRequestedInitialUri(stack.peek().getDocumentUri())) {

            // If the last accessed stack has restricted uri, load default location

            loadDefaultLocation();

        } else {

            mState.stack.reset(stack);

            mActivity.refreshCurrentRootAndDirectory(AnimationView.ANIM_NONE);