From 355d82b67e3b4307680f5dcfe901d9b818e2c34d Mon Sep 17 00:00:00 2001 From: Steve McKay Date: Tue, 1 Mar 2016 12:57:44 -0800 Subject: [PATCH] Don't assert against Recents title. It was causing a failure. Bug: 27383076 Change-Id: Ieb4693783831443e05f32333c181371b0eb4fb93 --- packages/DocumentsUI/src/com/android/documentsui/RootsCache.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java index ab67a51265e9..6856129cb530 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java +++ b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java @@ -115,7 +115,13 @@ public class RootsCache { * Gather roots from all known storage providers. */ 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.rootId == null); assert(mRecentsRoot.derivedIcon == R.drawable.ic_root_recent); @@ -123,7 +129,6 @@ public class RootsCache { assert(mRecentsRoot.flags == (Root.FLAG_LOCAL_ONLY | Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE)); - assert(mRecentsRoot.title == mContext.getString(R.string.root_recent)); assert(mRecentsRoot.availableBytes == -1); new UpdateTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); -- 2.11.0