Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use a DeviceConfig property for the default value of the clipboard notification setting." into sc-dev

Browse Source
This commit is contained in:
Oli Lan
2021-04-08 11:31:12 +00:00
committed by Android (Google) Code Review
parent bcc5b4c1ff cc9a4c4a14
commit 4d736b92f3
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/content/ClipboardManager.java
View File

@@ -51,6 +51,25 @@ import java.util.Objects;
*/ */
@SystemService(Context.CLIPBOARD_SERVICE) @SystemService(Context.CLIPBOARD_SERVICE)
public class ClipboardManager extends android.text.ClipboardManager { public class ClipboardManager extends android.text.ClipboardManager {
/**
* DeviceConfig property, within the clipboard namespace, that determines whether notifications
* are shown when an app accesses clipboard. This may be overridden by a user-controlled
* setting.
*
* @hide
*/
public static final String DEVICE_CONFIG_SHOW_ACCESS_NOTIFICATIONS =
"show_access_notifications";
/**
* Default value for the DeviceConfig property that determines whether notifications are shown
* when an app accesses clipboard.
*
* @hide
*/
public static final boolean DEVICE_CONFIG_DEFAULT_SHOW_ACCESS_NOTIFICATIONS = true;
private final Context mContext; private final Context mContext;
private final Handler mHandler; private final Handler mHandler;
private final IClipboard mService; private final IClipboard mService;

18
services/core/java/com/android/server/clipboard/ClipboardService.java
View File

@@ -31,6 +31,7 @@ import android.app.KeyguardManager;
import android.app.UriGrantsManager; import android.app.UriGrantsManager;
import android.content.ClipData; import android.content.ClipData;
import android.content.ClipDescription; import android.content.ClipDescription;
import android.content.ClipboardManager;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.ContentProvider; import android.content.ContentProvider;
import android.content.ContentResolver; import android.content.ContentResolver;
@@ -220,8 +221,6 @@ public class ClipboardService extends SystemService {
SystemProperties.getBoolean("ro.boot.qemu", false); SystemProperties.getBoolean("ro.boot.qemu", false);
// DeviceConfig properties // DeviceConfig properties
private static final String PROPERTY_SHOW_ACCESS_NOTIFICATIONS = "show_access_notifications";
private static final boolean DEFAULT_SHOW_ACCESS_NOTIFICATIONS = true;
private static final String PROPERTY_MAX_CLASSIFICATION_LENGTH = "max_classification_length"; private static final String PROPERTY_MAX_CLASSIFICATION_LENGTH = "max_classification_length";
private static final int DEFAULT_MAX_CLASSIFICATION_LENGTH = 400; private static final int DEFAULT_MAX_CLASSIFICATION_LENGTH = 400;
@@ -242,7 +241,8 @@ public class ClipboardService extends SystemService {
private final SparseArray<PerUserClipboard> mClipboards = new SparseArray<>(); private final SparseArray<PerUserClipboard> mClipboards = new SparseArray<>();
@GuardedBy("mLock") @GuardedBy("mLock")
private boolean mShowAccessNotifications = DEFAULT_SHOW_ACCESS_NOTIFICATIONS; private boolean mShowAccessNotifications =
ClipboardManager.DEVICE_CONFIG_DEFAULT_SHOW_ACCESS_NOTIFICATIONS;
@GuardedBy("mLock") @GuardedBy("mLock")
private int mMaxClassificationLength = DEFAULT_MAX_CLASSIFICATION_LENGTH; private int mMaxClassificationLength = DEFAULT_MAX_CLASSIFICATION_LENGTH;
@@ -310,8 +310,10 @@ public class ClipboardService extends SystemService {
private void updateConfig() { private void updateConfig() {
synchronized (mLock) { synchronized (mLock) {
mShowAccessNotifications = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_CLIPBOARD, mShowAccessNotifications = DeviceConfig.getBoolean(
PROPERTY_SHOW_ACCESS_NOTIFICATIONS, DEFAULT_SHOW_ACCESS_NOTIFICATIONS); DeviceConfig.NAMESPACE_CLIPBOARD,
ClipboardManager.DEVICE_CONFIG_SHOW_ACCESS_NOTIFICATIONS,
ClipboardManager.DEVICE_CONFIG_DEFAULT_SHOW_ACCESS_NOTIFICATIONS);
mMaxClassificationLength = DeviceConfig.getInt(DeviceConfig.NAMESPACE_CLIPBOARD, mMaxClassificationLength = DeviceConfig.getInt(DeviceConfig.NAMESPACE_CLIPBOARD,
PROPERTY_MAX_CLASSIFICATION_LENGTH, DEFAULT_MAX_CLASSIFICATION_LENGTH); PROPERTY_MAX_CLASSIFICATION_LENGTH, DEFAULT_MAX_CLASSIFICATION_LENGTH);
} }
@@ -1056,11 +1058,9 @@ public class ClipboardService extends SystemService {
if (clipboard.primaryClip == null) { if (clipboard.primaryClip == null) {
return; return;
} }
if (!mShowAccessNotifications) {
return;
}
if (Settings.Secure.getInt(getContext().getContentResolver(), if (Settings.Secure.getInt(getContext().getContentResolver(),
Settings.Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS, 1) == 0) { Settings.Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS,
(mShowAccessNotifications ? 1 : 0)) == 0) {
return; return;
} }
// Don't notify if the app accessing the clipboard is the same as the current owner. // Don't notify if the app accessing the clipboard is the same as the current owner.