Fix crash issue when hit back while scrolling am: b20718900a (36a516f3) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/BaseActivity.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -793,6 +793,11 @@ public abstract class BaseActivity
		*/
		protected boolean popDir() {
		if (mState.stack.size() > 1) {
		final DirectoryFragment fragment = getDirectoryFragment();
		if (fragment != null) {
		fragment.stopScroll();
		}

		mState.stack.pop();
		refreshCurrentRootAndDirectory(AnimationView.ANIM_LEAVE);
		return true;

+8 −0

Original line number	Diff line number	Diff line
		@@ -335,6 +335,10 @@ public class DocumentInfo implements Durable, Parcelable {
		* Missing or null values are returned as -1.
		*/
		public static long getCursorLong(Cursor cursor, String columnName) {
		if (cursor == null) {
		return -1;
		}

		final int index = cursor.getColumnIndex(columnName);
		if (index == -1) return -1;
		final String value = cursor.getString(index);
		@@ -350,6 +354,10 @@ public class DocumentInfo implements Durable, Parcelable {
		* Missing or null values are returned as 0.
		*/
		public static int getCursorInt(Cursor cursor, String columnName) {
		if (cursor == null) {
		return 0;
		}

		final int index = cursor.getColumnIndex(columnName);
		return (index != -1) ? cursor.getInt(index) : 0;
		}

+10 −1

Original line number	Diff line number	Diff line
		@@ -1096,7 +1096,7 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On
		}

		/**
		* Scroll recycler view in fregment to top
		* Scroll to top of recyclerView in fragment
		*/
		public void scrollToTop() {
		if (mRecView != null) {
		@@ -1104,6 +1104,15 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On
		}
		}

		/**
		* Stop the scroll of recyclerView in fragment
		*/
		public void stopScroll() {
		if (mRecView != null) {
		mRecView.stopScroll();
		}
		}

		@Override
		public void onRefresh() {
		// Remove thumbnail cache. We do this not because we're worried about stale thumbnails as it