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

Commit 4f695095 authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Remove clipboard_noninteractive_on_lockscreen flag 

Bug: 409608685
Fix: 409608685
Bug: 317048495
Fix: 317048495
Test: manual, atest ClipboardListenerTest
Flag: EXEMPT removing flag
Change-Id: Ib5543dda3d596a055933f77c63302c2553dd0edb
parent 8bee3cf3

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -887,16 +887,6 @@ flag { 
    }

}



flag {

    name: "clipboard_noninteractive_on_lockscreen"

    namespace: "systemui"

    description: "Prevents the interactive clipboard UI from appearing when device is locked"

    bug: "317048495"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "notify_power_manager_user_activity_background"

    namespace: "systemui"

packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java

+1 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.clipboardoverlay; 


import static android.content.ClipDescription.CLASSIFICATION_COMPLETE;



import static com.android.systemui.Flags.clipboardNoninteractiveOnLockscreen;

import static com.android.systemui.Flags.clipboardOverlayMultiuser;

import static com.android.systemui.Flags.overrideSuppressOverlayCondition;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ENTERED;
@@ -148,7 +147,7 @@ public class ClipboardListener implements 
        }



        // user should not access intents before setup or while device is locked

        if ((clipboardNoninteractiveOnLockscreen() && mKeyguardManagerForUser.isDeviceLocked())

        if (mKeyguardManagerForUser.isDeviceLocked()

                || !isUserSetupComplete()

                || clipData == null // shouldn't happen, but just in case

                || clipData.getItemCount() == 0) {

packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardListenerTest.java

+1 −18
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ public class ClipboardListenerTest extends SysuiTestCase { 


    @Test

    @DisableFlags(Flags.FLAG_CLIPBOARD_OVERLAY_MULTIUSER)

    @EnableFlags(Flags.FLAG_CLIPBOARD_NONINTERACTIVE_ON_LOCKSCREEN)

    public void test_deviceLockedForSecondaryUser_withoutMultiuser_showsOverlay() {

        when(mKeyguardManager.isDeviceLocked()).thenReturn(false);

        when(mKeyguardManagerSecondaryUser.isDeviceLocked()).thenReturn(true);
@@ -239,8 +238,7 @@ public class ClipboardListenerTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags({Flags.FLAG_CLIPBOARD_OVERLAY_MULTIUSER,

            Flags.FLAG_CLIPBOARD_NONINTERACTIVE_ON_LOCKSCREEN})

    @EnableFlags(Flags.FLAG_CLIPBOARD_OVERLAY_MULTIUSER)

    public void test_deviceLockedForSecondaryUser_showsToast() {

        when(mKeyguardManager.isDeviceLocked()).thenReturn(false);

        when(mKeyguardManagerSecondaryUser.isDeviceLocked()).thenReturn(true);
@@ -311,7 +309,6 @@ public class ClipboardListenerTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_CLIPBOARD_NONINTERACTIVE_ON_LOCKSCREEN)

    public void test_deviceLocked_showsToast() {

        when(mKeyguardManager.isDeviceLocked()).thenReturn(true);
@@ -324,20 +321,6 @@ public class ClipboardListenerTest extends SysuiTestCase { 
        verifyNoMoreInteractions(mOverlayControllerProvider);

    }



    @Test

    @DisableFlags(Flags.FLAG_CLIPBOARD_NONINTERACTIVE_ON_LOCKSCREEN)

    public void test_deviceLocked_legacyBehavior_showsInteractiveUI() {

        when(mKeyguardManager.isDeviceLocked()).thenReturn(true);



        mClipboardListener.start();

        mClipboardListener.onPrimaryClipChanged();



        verify(mUiEventLogger, times(1)).log(

                ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ENTERED, 0, mSampleSource);

        verify(mOverlayController).setClipData(mSampleClipData, mSampleSource);

        verifyNoMoreInteractions(mClipboardToast);

    }



    @Test

    @EnableFlags(Flags.FLAG_OVERRIDE_SUPPRESS_OVERLAY_CONDITION)

    public void test_onPrimaryClipChanged_notSuppressOverlay() {