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

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

Browse Source
This commit is contained in:
Tomasz Mikolajewski
2016-04-07 03:27:11 +00:00
committed by Android (Google) Code Review
parent 48143f7ec5 90e0ff0884
commit e68cc51614
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
View File

@@ -45,6 +45,7 @@ import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.provider.DocumentsContract; import android.provider.DocumentsContract;
import android.provider.DocumentsContract.Document; import android.provider.DocumentsContract.Document;
@@ -226,7 +227,8 @@ public class DirectoryFragment extends Fragment
mStateKey = buildStateKey(mRoot, mDocument); mStateKey = buildStateKey(mRoot, mDocument);
mQuery = args.getString(Shared.EXTRA_QUERY); mQuery = args.getString(Shared.EXTRA_QUERY);
mType = args.getInt(Shared.EXTRA_TYPE); 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); mSearchMode = args.getBoolean(Shared.EXTRA_SEARCH_MODE);
mIconHelper = new IconHelper(context, MODE_GRID); mIconHelper = new IconHelper(context, MODE_GRID);
@@ -290,14 +292,25 @@ public class DirectoryFragment extends Fragment
outState.putParcelable(Shared.EXTRA_ROOT, mRoot); outState.putParcelable(Shared.EXTRA_ROOT, mRoot);
outState.putParcelable(Shared.EXTRA_DOC, mDocument); outState.putParcelable(Shared.EXTRA_DOC, mDocument);
outState.putString(Shared.EXTRA_QUERY, mQuery); outState.putString(Shared.EXTRA_QUERY, mQuery);
outState.putParcelable(Shared.EXTRA_SELECTION, mSelection);
outState.putBoolean(Shared.EXTRA_SEARCH_MODE, mSearchMode);
// 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);
}
} finally {
parcel.recycle();
}
outState.putBoolean(Shared.EXTRA_SEARCH_MODE, mSearchMode);
} }
@Override @Override
public void onActivityResult(@RequestCode int requestCode, int resultCode, Intent data) { public void onActivityResult(@RequestCode int requestCode, int resultCode, Intent data) {
switch(requestCode) { switch (requestCode) {
case REQUEST_COPY_DESTINATION: case REQUEST_COPY_DESTINATION:
handleCopyResult(resultCode, data); handleCopyResult(resultCode, data);
break; break;