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

Don\'t read raw root from State, use getCurrentRoot

Browse Source 
am: c265117881

* commit 'c2651178812786462ee8d201f85263ea36d38b6d':
  Don't read raw root from State, use getCurrentRoot
This commit is contained in:
Steve McKay
2016-02-17 19:31:39 +00:00
committed by android-build-merger
parent 834e1e27af c265117881
commit bba8b91620
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
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_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