commit 32a93a5ce67b1f5e2fe6a92ab96330c3626e9535
author Chun Zhang <chunzhang@google.com> Thu Mar 24 20:49:25 2022 -0700
committer Chun Zhang <chunzhang@google.com> Fri Mar 25 04:27:22 2022 +0000
tree 9eaaabf1a95cb09a042b9b1f7d1ac761c93a1d6b
parent 98fb5475edd67740b4a3f498aeaa3ed1371aae92

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

diff --git a/framework-t/api/system-current.txt b/framework-t/api/system-current.txt
index ddfd30c..03f9c8e 100644
--- a/framework-t/api/system-current.txt
+++ b/framework-t/api/system-current.txt
@@ -302,7 +302,7 @@
 
   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);

nearby/framework/java/android/nearby/NearbyManager.java

diff --git a/nearby/framework/java/android/nearby/NearbyManager.java b/nearby/framework/java/android/nearby/NearbyManager.java
index 1c1d59f..1b82dca 100644
--- a/nearby/framework/java/android/nearby/NearbyManager.java
+++ b/nearby/framework/java/android/nearby/NearbyManager.java
@@ -259,6 +259,7 @@
      * @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);