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

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

Merge tag 'android-security-14.0.0_r19' into staging/lineage-21.0_android-security-14.0.0_r19 

Android security 14.0.0 release 19

* tag 'android-security-14.0.0_r19':
  Fix for SAF loophole in the lastAccessedStack.
  Restrict initial location for ACTION_OPEN_DOCUMENT/_TREE

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

Change-Id: Ia106b27896cab97e10fe3ea555bb3e1cbbcd700d
parents 1620d681 31d94189

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);