From 32a93a5ce67b1f5e2fe6a92ab96330c3626e9535 Mon Sep 17 00:00:00 2001 From: Chun Zhang Date: Thu, 24 Mar 2022 20:49:25 -0700 Subject: [PATCH] Require Permission Manifest.permission.WRITE_SECURE_SETTINGS on setFastPairScanEnabled API. Test: CTS Bug: 216590902 Ignore-AOSP-First: nearby_not_in_aosp_yet Change-Id: I017af7de2ba930aa15d862138684eb4dce884348 --- framework-t/api/system-current.txt | 2 +- nearby/framework/java/android/nearby/NearbyManager.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/framework-t/api/system-current.txt b/framework-t/api/system-current.txt index ddfd30ce95..03f9c8e2b0 100644 --- a/framework-t/api/system-current.txt +++ b/framework-t/api/system-current.txt @@ -302,7 +302,7 @@ package android.nearby { public class NearbyManager { method public static boolean getFastPairScanEnabled(@NonNull android.content.Context); - method public static void setFastPairScanEnabled(@NonNull android.content.Context, boolean); + method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static void setFastPairScanEnabled(@NonNull android.content.Context, boolean); method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_ADVERTISE, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void startBroadcast(@NonNull android.nearby.BroadcastRequest, @NonNull java.util.concurrent.Executor, @NonNull android.nearby.BroadcastCallback); method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int startScan(@NonNull android.nearby.ScanRequest, @NonNull java.util.concurrent.Executor, @NonNull android.nearby.ScanCallback); method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_ADVERTISE, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void stopBroadcast(@NonNull android.nearby.BroadcastCallback); diff --git a/nearby/framework/java/android/nearby/NearbyManager.java b/nearby/framework/java/android/nearby/NearbyManager.java index 1c1d59f7b0..1b82dca728 100644 --- a/nearby/framework/java/android/nearby/NearbyManager.java +++ b/nearby/framework/java/android/nearby/NearbyManager.java @@ -259,6 +259,7 @@ public class NearbyManager { * @param context the {@link Context} to set the setting * @param enable whether the Fast Pair scan should be enabled */ + @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS) public static void setFastPairScanEnabled(@NonNull Context context, boolean enable) { Settings.Secure.putInt( context.getContentResolver(), FAST_PAIR_SCAN_ENABLED, enable ? 1 : 0);