Don't read raw root from State, use getCurrentRoot

Bug: 27213606
Change-Id: I9abf42672d914041ab710bd09886c0c4034b85b6
This commit is contained in:
Steve McKay
2016-02-17 11:00:55 -08:00
parent ac83d19665
commit c265117881

View File

@@ -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_NONE;
import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_SIDE; import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_SIDE;
import static com.android.internal.util.Preconditions.checkArgument; import static com.android.internal.util.Preconditions.checkArgument;
import static com.android.internal.util.Preconditions.checkState;
import android.app.Activity; import android.app.Activity;
import android.app.Fragment; import android.app.Fragment;
@@ -464,8 +463,7 @@ public abstract class BaseActivity extends Activity
* Set mode based on explicit user action. * Set mode based on explicit user action.
*/ */
void setViewMode(@ViewMode int mode) { void setViewMode(@ViewMode int mode) {
checkState(mState.stack.root != null); LocalPreferences.setViewMode(this, getCurrentRoot(), mode);
LocalPreferences.setViewMode(this, mState.stack.root, mode);
mState.derivedMode = mode; mState.derivedMode = mode;
// view icon needs to be updated, but we *could* do it // view icon needs to be updated, but we *could* do it