From c2651178812786462ee8d201f85263ea36d38b6d Mon Sep 17 00:00:00 2001 From: Steve McKay Date: Wed, 17 Feb 2016 11:00:55 -0800 Subject: [PATCH] Don't read raw root from State, use getCurrentRoot Bug: 27213606 Change-Id: I9abf42672d914041ab710bd09886c0c4034b85b6 --- .../DocumentsUI/src/com/android/documentsui/BaseActivity.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java index 470989de33629..648c79e9fc411 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java @@ -23,7 +23,6 @@ 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.android.internal.util.Preconditions.checkState; import android.app.Activity; import android.app.Fragment; @@ -464,8 +463,7 @@ public abstract class BaseActivity extends Activity * Set mode based on explicit user action. */ void setViewMode(@ViewMode int mode) { - checkState(mState.stack.root != null); - LocalPreferences.setViewMode(this, mState.stack.root, mode); + LocalPreferences.setViewMode(this, getCurrentRoot(), mode); mState.derivedMode = mode; // view icon needs to be updated, but we *could* do it