Merge "Fix app crash when activity title set to null at empty work profile root." into rvc-dev

1 files changed, 2 insertions, 2 deletions

diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index d0ffe593c..0ddf001be 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -619,10 +619,10 @@ public abstract class BaseActivity
 
         // Causes talkback to announce the activity's new title
         String appName = getString(R.string.files_label);
-        if (getTitle().toString().isEmpty()) {
+        if (getTitle() == null || getTitle().toString().isEmpty()) {
             // First launch, TalkBack announces app name.
             setTitle(String.format("%s. %s", appName, mState.stack.getTitle()));
-        } else {
+        } else if (mState.stack.getTitle() != null) {
             setTitle(mState.stack.getTitle());
         }