Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0888a3ac authored by Zemiao Zhu's avatar Zemiao Zhu Committed by Android (Google) Code Review
Browse files

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

parents fa6e14ca 8c8af2a8
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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());
        }