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

Commit d6e86705 authored by Zemiao Zhu's avatar Zemiao Zhu Committed by Automerger Merge Worker
Browse files

Merge "Fix app crash when activity title set to null at empty work profile... 

Merge "Fix app crash when activity title set to null at empty work profile root." into rvc-dev am: 0888a3ac am: 427cb75b am: ae405ec3

Change-Id: I9501ddd8952ac9708012c3fd1b1491a4b115470a
parents ab2bdbb9 ae405ec3

src/com/android/documentsui/BaseActivity.java

+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());

        }