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

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

Merge "Finish activity when created by documents provider and documents... 

Merge "Finish activity when created by documents provider and documents provider gone." into rvc-dev am: c4609477

Change-Id: I2ed5d2aa3643e3d1e4aa951b3e561ff41c79d910
parents 1cc02d9b c4609477

src/com/android/documentsui/RootsMonitor.java

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.net.Uri;



import androidx.localbroadcastmanager.content.LocalBroadcastManager;



import com.android.documentsui.AbstractActionHandler.CommonAddons;
@@ -136,7 +137,7 @@ final class RootsMonitor<T extends Activity & CommonAddons> { 
            // activity.

            final Uri uri = mOwner.getIntent().getData();

            if (uri != null && uri.equals(mCurrentRoot.getUri())) {

                mOwner.finish();

                mOwner.finishAndRemoveTask();

                return;

            }