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

Commit 5e52bc9c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity"...

Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" am: d791f7b9 am: 24e8db33

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255618



Change-Id: I506f283c0dccadcc940245195d5112ca7ec4c154
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88706bbf 24e8db33
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -27,12 +27,14 @@ import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerExecutor;
import android.os.Looper;
import android.os.Message;
import android.widget.Toast;

import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;

import com.android.settings.R;
import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
@@ -143,7 +145,7 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements
        super.onPause();
    }

    private final Handler mHandler = new Handler() {
    private final Handler mHandler = new Handler(Looper.getMainLooper()) {
        @Override
        public void handleMessage(Message msg) {
            switch (msg.what) {
@@ -162,13 +164,17 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements
        dismissDialogs();

        // Throws error dialog.
        final FragmentManager fragmentManager = getSupportFragmentManager();
        if (fragmentManager.isDestroyed() || fragmentManager.isStateSaved()) {
            return;
        }
        final NetworkRequestErrorDialogFragment dialogFragment =
                NetworkRequestErrorDialogFragment.newInstance();
        dialogFragment.setRejectCallback(mUserSelectionCallback);
        final Bundle bundle = new Bundle();
        bundle.putSerializable(NetworkRequestErrorDialogFragment.DIALOG_TYPE, type);
        dialogFragment.setArguments(bundle);
        dialogFragment.show(getSupportFragmentManager(), TAG);
        dialogFragment.show(fragmentManager, TAG);
        mShowingErrorDialog = true;
    }