commit 3758253ae8fa37ee7be3a9dceddbc48d3944053f
author Ajay Panicker <apanicke@google.com> Tue Sep 20 23:55:44 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 20 23:55:44 2016 +0000
tree a641d24c9d37a7ed0c47e45431dd34a0524ab38f
parent 3fca892d3e3b1bab481c92c8ec5297591daf2f5c
parent 271e34dbd55c9ba6d67c6aa0e8912736cfcd312a

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a
am: 271e34dbd5

Change-Id: I954b8f2d9333fa6bb549dc812733d2b8f71220b9

core/java/android/bluetooth/BluetoothDevice.java

diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index d789a94..cd74faa 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -993,7 +993,7 @@
 
     /**
      * Confirm passkey for {@link #PAIRING_VARIANT_PASSKEY_CONFIRMATION} pairing.
-     * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}.
+     * <p>Requires {@link android.Manifest.permission#BLUETOOTH_PRIVILEGED}.
      *
      * @return true confirmation has been sent out
      *         false for error