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

Commit 33a01ec1 authored by Arthur Hung's avatar Arthur Hung
Browse files

Prevent crash when unregsiter the broadcast 

Make sure the receiver could be generated and registered when `onStart`
and cleared when `onStop`.

Bug: 225214384
Test: Show error dialog, atest WindowInputTests
Change-Id: Ib39629180aac1a7aa418e9c7e540922c7f865718
parent 66fa90ea

services/core/java/com/android/server/am/AppWaitingForDebuggerDialog.java

+0 −3
Original line number Diff line number Diff line
@@ -58,9 +58,6 @@ final class AppWaitingForDebuggerDialog extends BaseErrorDialog { 
        getWindow().setAttributes(attrs);

    }



    public void onStop() {

    }



    @Override

    protected void closeDialog() {

        /* Do nothing */

services/core/java/com/android/server/am/BaseErrorDialog.java

+25 −12
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.server.am;



import static android.content.Context.RECEIVER_EXPORTED;



import android.app.AlertDialog;

import android.content.BroadcastReceiver;

import android.content.Context;
@@ -34,6 +36,7 @@ public class BaseErrorDialog extends AlertDialog { 
    private static final int DISABLE_BUTTONS = 1;



    private boolean mConsuming = true;

    private BroadcastReceiver mReceiver;



    public BaseErrorDialog(Context context) {

        super(context, com.android.internal.R.style.Theme_DeviceDefault_Dialog_AppError);
@@ -52,14 +55,33 @@ public class BaseErrorDialog extends AlertDialog { 
        super.onStart();

        mHandler.sendEmptyMessage(DISABLE_BUTTONS);

        mHandler.sendMessageDelayed(mHandler.obtainMessage(ENABLE_BUTTONS), 1000);

        if (mReceiver == null) {

            mReceiver = new BroadcastReceiver() {

                @Override

                public void onReceive(Context context, Intent intent) {

                    if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) {

                        closeDialog();

                    }

                }

            };

            getContext().registerReceiver(mReceiver,

                new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), Context.RECEIVER_EXPORTED);

                    new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), RECEIVER_EXPORTED);

        }

    }



    @Override

    protected void onStop() {

        super.onStop();

        if (mReceiver != null) {

            try {

                getContext().unregisterReceiver(mReceiver);

            } catch (IllegalArgumentException e) {

                // Receiver not registered exception.

                android.util.Slog.e("BaseErrorDialog",

                        "unregisterReceiver threw exception: " + e.getMessage());

            }

            mReceiver = null;

        }

    }



    public boolean dispatchKeyEvent(KeyEvent event) {
@@ -107,13 +129,4 @@ public class BaseErrorDialog extends AlertDialog { 
            dismiss();

        }

    }



    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) {

                closeDialog();

            }

        }

    };

}

services/core/java/com/android/server/wm/FactoryErrorDialog.java

+0 −3
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ final class FactoryErrorDialog extends BaseErrorDialog { 
        getWindow().setAttributes(attrs);

    }



    public void onStop() {

    }



    @Override

    protected void closeDialog() {

        /* Do nothing */