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

Commit d7815b6d authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Add device config flag to ignore clipboard source package" into... 

Merge "Add device config flag to ignore clipboard source package" into tm-qpr-dev am: fb435f43 am: 31c10616

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20499567



Change-Id: Idf553bcbf959bf94018217572533e6e4c7002605
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 736209ff 31c10616

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+7 −0
Original line number Diff line number Diff line
@@ -583,6 +583,13 @@ public final class SystemUiDeviceConfigFlags { 
     */

    public static final String CLIPBOARD_OVERLAY_SHOW_ACTIONS = "clipboard_overlay_show_actions";



    /**

     * (boolean) Whether to ignore the source package for determining whether to use remote copy

     * behavior in the clipboard UI.

     */

    public static final String CLIPBOARD_IGNORE_REMOTE_COPY_SOURCE =

            "clipboard_ignore_remote_copy_source";



    /**

     * (boolean) Whether to combine the broadcasts APPWIDGET_ENABLED and APPWIDGET_UPDATE

     */

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

+9 −0
Original line number Diff line number Diff line
@@ -20,7 +20,10 @@ import android.content.ClipData; 
import android.content.ClipDescription;

import android.content.ComponentName;

import android.content.Context;

import android.os.Build;

import android.provider.DeviceConfig;



import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;

import com.android.systemui.R;



import javax.inject.Inject;
@@ -35,6 +38,12 @@ class ClipboardOverlayUtils { 
        if (clipData != null && clipData.getDescription().getExtras() != null

                && clipData.getDescription().getExtras().getBoolean(

                ClipDescription.EXTRA_IS_REMOTE_DEVICE)) {

            if (Build.isDebuggable() && DeviceConfig.getBoolean(

                    DeviceConfig.NAMESPACE_SYSTEMUI,

                    SystemUiDeviceConfigFlags.CLIPBOARD_IGNORE_REMOTE_COPY_SOURCE,

                    false)) {

                return true;

            }

            ComponentName remoteComponent = ComponentName.unflattenFromString(

                    context.getResources().getString(R.string.config_remoteCopyPackage));

            if (remoteComponent != null) {