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

Merge "Don't assert against Recents title." into nyc-dev

Browse Source
This commit is contained in:
Steve McKay
2016-03-01 21:39:25 +00:00
committed by Android (Google) Code Review
parent a75c2a7819 355d82b67e
commit d511a090d2
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/DocumentsUI/src/com/android/documentsui/RootsCache.java
View File

@@ -115,7 +115,13 @@ public class RootsCache {
* Gather roots from all known storage providers. * Gather roots from all known storage providers.
*/ */
public void updateAsync() { public void updateAsync() {
// Verifying an assumption about the recents root being immutable.
// NOTE: This method is called when the UI language changes.
// For that reason we upadte our RecentsRoot to reflect
// the current language.
mRecentsRoot.title = mContext.getString(R.string.root_recent);
// Nothing else about the root should ever change.
assert(mRecentsRoot.authority == null); assert(mRecentsRoot.authority == null);
assert(mRecentsRoot.rootId == null); assert(mRecentsRoot.rootId == null);
assert(mRecentsRoot.derivedIcon == R.drawable.ic_root_recent); assert(mRecentsRoot.derivedIcon == R.drawable.ic_root_recent);
@@ -123,7 +129,6 @@ public class RootsCache {
assert(mRecentsRoot.flags == (Root.FLAG_LOCAL_ONLY assert(mRecentsRoot.flags == (Root.FLAG_LOCAL_ONLY
| Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_IS_CHILD
| Root.FLAG_SUPPORTS_CREATE)); | Root.FLAG_SUPPORTS_CREATE));
assert(mRecentsRoot.title == mContext.getString(R.string.root_recent));
assert(mRecentsRoot.availableBytes == -1); assert(mRecentsRoot.availableBytes == -1);
new UpdateTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); new UpdateTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);