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

Commit 5efcc15d authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Fix crash due to unregistered receiver"

parents e3ef246c 2a13d21d
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -117,9 +117,14 @@ public class WorkLockActivity extends Activity {
        }
    }

    @VisibleForTesting
    protected void unregisterBroadcastReceiver() {
        mBroadcastDispatcher.unregisterReceiver(mLockEventReceiver);
    }

    @Override
    public void onDestroy() {
        unregisterReceiver(mLockEventReceiver);
        unregisterBroadcastReceiver();
        super.onDestroy();
    }

+10 −1
Original line number Diff line number Diff line
@@ -19,7 +19,10 @@ package com.android.systemui.keyguard;
import static android.app.ActivityManager.TaskDescription;

import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import android.annotation.ColorInt;
@@ -36,7 +39,6 @@ import androidx.test.runner.AndroidJUnit4;

import com.android.systemui.SysuiTestCase;
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.keyguard.WorkLockActivity;

import org.junit.Before;
import org.junit.Test;
@@ -112,4 +114,11 @@ public class WorkLockActivityTest extends SysuiTestCase {
                .putExtra(Intent.EXTRA_USER_ID, USER_ID));
        assertEquals(orgColor, mActivity.getPrimaryColor());
    }

    @Test
    public void testUnregisteredFromDispatcher() {
        mActivity.unregisterBroadcastReceiver();
        verify(mBroadcastDispatcher).unregisterReceiver(any());
        verify(mContext, never()).unregisterReceiver(any());
    }
}