Merge "Update preconditions to be asserts..." into nyc-dev (9e9bce72) · Commits · e / os / android_frameworks_base

packages/DocumentsUI/Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,10 @@ LOCAL_AAPT_FLAGS := \
		--extra-packages android.support.design \
		--extra-packages android.support.v7.recyclerview

		LOCAL_JACK_FLAGS := \
		-D jack.assert.policy=enable \
		-D jack.optimization.inner-class.accessors=true

		LOCAL_PACKAGE_NAME := DocumentsUI
		LOCAL_CERTIFICATE := platform

packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -22,8 +22,6 @@ import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_ENTER;
		import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_LEAVE;
		import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE;
		import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_SIDE;
		import static com.android.internal.util.Preconditions.checkArgument;
		import static com.google.common.base.Preconditions.checkState;

		import android.app.Activity;
		import android.app.Fragment;
		@@ -54,7 +52,6 @@ import com.android.documentsui.dirlist.Model;
		import com.android.documentsui.model.DocumentInfo;
		import com.android.documentsui.model.DocumentStack;
		import com.android.documentsui.model.RootInfo;
		import com.android.internal.util.Preconditions;

		import java.io.FileNotFoundException;
		import java.util.ArrayList;
		@@ -330,7 +327,8 @@ public abstract class BaseActivity extends Activity
		}

		void openContainerDocument(DocumentInfo doc) {
		checkArgument(doc.isContainer());
		assert(doc.isContainer());

		mState.pushDocument(doc);
		// Show an opening animation only if pressing "back" would get us back to the
		// previous directory. Especially after opening a root document, pressing
		@@ -373,7 +371,8 @@ public abstract class BaseActivity extends Activity
		@Override
		public void onSearchChanged(@Nullable String query) {
		// We should not get here if root is not searchable
		checkState(canSearchRoot());
		assert(canSearchRoot());

		reloadSearch(query);
		}

		@@ -673,7 +672,8 @@ public abstract class BaseActivity extends Activity

		@Override
		protected RootInfo run(RootInfo... roots) {
		checkArgument(roots.length == 1);
		assert(roots.length == 1);

		final RootInfo currentRoot = roots[0];
		final Collection<RootInfo> cachedRoots = mOwner.mRoots.getRootsBlocking();
		RootInfo homeRoot = null;
		@@ -686,7 +686,7 @@ public abstract class BaseActivity extends Activity
		return null;
		}
		}
		Preconditions.checkNotNull(homeRoot);
		assert(homeRoot != null);
		mHome = mOwner.getRootDocumentBlocking(homeRoot);
		return homeRoot;
		}

packages/DocumentsUI/src/com/android/documentsui/DocumentClipper.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.support.annotation.Nullable;
		import android.util.Log;

		import com.android.documentsui.model.DocumentInfo;
		import com.android.internal.util.Preconditions;

		import libcore.io.IoUtils;

		@@ -85,7 +84,7 @@ public final class DocumentClipper {
		* This should be run from inside an AsyncTask.
		*/
		public List<DocumentInfo> getDocumentsFromClipData(ClipData clipData) {
		Preconditions.checkNotNull(clipData);
		assert(clipData != null);
		final List<DocumentInfo> srcDocs = new ArrayList<>();

		int count = clipData.getItemCount();

packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import static com.android.documentsui.State.ACTION_OPEN;
		import static com.android.documentsui.State.ACTION_OPEN_TREE;
		import static com.android.documentsui.State.ACTION_PICK_COPY_DESTINATION;
		import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE;
		import static com.android.internal.util.Preconditions.checkArgument;

		import android.app.Activity;
		import android.app.Fragment;
		@@ -333,7 +332,7 @@ public class DocumentsActivity extends BaseActivity {

		@Override
		void onDirectoryCreated(DocumentInfo doc) {
		checkArgument(doc.isDirectory());
		assert(doc.isDirectory());
		openContainerDocument(doc);
		}

packages/DocumentsUI/src/com/android/documentsui/DownloadsActivity.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -16,10 +16,8 @@

		package com.android.documentsui;

		import static com.android.documentsui.Shared.DEBUG;
		import static com.android.documentsui.State.ACTION_MANAGE;
		import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE;
		import static com.android.internal.util.Preconditions.checkState;

		import android.app.Activity;
		import android.app.Fragment;
		@@ -41,7 +39,6 @@ import com.android.documentsui.dirlist.DirectoryFragment;
		import com.android.documentsui.dirlist.Model;
		import com.android.documentsui.model.DocumentInfo;
		import com.android.documentsui.model.RootInfo;
		import com.android.internal.util.Preconditions;

		import java.util.Arrays;
		import java.util.List;
		@@ -121,11 +118,11 @@ public class DownloadsActivity extends BaseActivity {
		final RootInfo root = getCurrentRoot();
		final DocumentInfo cwd = getCurrentDirectory();

		if (DEBUG) checkState(!mSearchManager.isSearching());
		assert(!mSearchManager.isSearching());

		// If started in manage roots mode, there has to be a cwd (i.e. the root dir of the managed
		// root).
		Preconditions.checkNotNull(cwd);
		assert(cwd != null);

		// Normal boring directory
		DirectoryFragment.showDirectory(fm, root, cwd, anim);
		@@ -133,7 +130,8 @@ public class DownloadsActivity extends BaseActivity {

		@Override
		public void onDocumentPicked(DocumentInfo doc, Model model) {
		Preconditions.checkArgument(!doc.isDirectory());
		assert(!doc.isDirectory());

		// First try managing the document; we expect manager to filter
		// based on authority, so we don't grant.
		final Intent manage = new Intent(DocumentsContract.ACTION_MANAGE_DOCUMENT);