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

Commit 47d38046 authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski Committed by android-build-merger
Browse files

Merge "Do not crash when selecting a lot of files." into nyc-dev 

am: e68cc51

* commit 'e68cc516148ccd6b4cc7d3d26be59bc595130379':
  Do not crash when selecting a lot of files.

Change-Id: I18fe9f20efea202cf214222a54692b89b1138242
parents 952bf9ec 52fb535e

src/com/android/documentsui/dirlist/DirectoryFragment.java

+17 −4
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.graphics.drawable.Drawable; 
import android.net.Uri;

import android.os.AsyncTask;

import android.os.Bundle;

import android.os.Parcel;

import android.os.Parcelable;

import android.provider.DocumentsContract;

import android.provider.DocumentsContract.Document;
@@ -227,7 +228,8 @@ public class DirectoryFragment extends Fragment 
        mStateKey = buildStateKey(mRoot, mDocument);

        mQuery = args.getString(Shared.EXTRA_QUERY);

        mType = args.getInt(Shared.EXTRA_TYPE);

        mSelection = args.getParcelable(Shared.EXTRA_SELECTION);

        final Selection selection = args.getParcelable(Shared.EXTRA_SELECTION);

        mSelection = selection != null ? selection : new Selection();

        mSearchMode = args.getBoolean(Shared.EXTRA_SEARCH_MODE);



        mIconHelper = new IconHelper(context, MODE_GRID);
@@ -291,9 +293,20 @@ public class DirectoryFragment extends Fragment 
        outState.putParcelable(Shared.EXTRA_ROOT, mRoot);

        outState.putParcelable(Shared.EXTRA_DOC, mDocument);

        outState.putString(Shared.EXTRA_QUERY, mQuery);



        // Workaround. To avoid crash, write only up to 512 KB of selection.

        // If more files are selected, then the selection will be lost.

        final Parcel parcel = Parcel.obtain();

        try {

            mSelection.writeToParcel(parcel, 0);

            if (parcel.dataSize() <= 512 * 1024) {

                outState.putParcelable(Shared.EXTRA_SELECTION, mSelection);

        outState.putBoolean(Shared.EXTRA_SEARCH_MODE, mSearchMode);

            }

        } finally {

            parcel.recycle();

        }



        outState.putBoolean(Shared.EXTRA_SEARCH_MODE, mSearchMode);

    }



    @Override