diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothAdapter.java | 8 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 |
2 files changed, 15 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 8768f40..b22b914 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -96,6 +96,14 @@ public final class BluetoothAdapter { private static final boolean VDBG = false; /** + * Default MAC address reported to a client that does not have the + * android.permission.LOCAL_MAC_ADDRESS permission. + * + * @hide + */ + public static final String DEFAULT_MAC_ADDRESS = "02:00:00:00:00:00"; + + /** * Sentinel error value for this class. Guaranteed to not equal any other * integer constant in this class. Provided as a convenience for functions * that require a sentinel error value, for example: diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 608d718..595f9f0 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -898,7 +898,9 @@ android:label="@string/permlab_changeWimaxState" android:protectionLevel="dangerous" /> - <!-- Allows applications to act as network scorers. @hide @SystemApi--> + <!--@SystemApi Allows applications to the the local WiFi and Bluetooth MAC address. + @hide + --> <permission android:name="android.permission.SCORE_NETWORKS" android:protectionLevel="signature|system" /> @@ -2447,6 +2449,10 @@ <permission android:name="android.permission.KILL_UID" android:protectionLevel="signature" /> + <!-- Allows applications to act as network scorers. @hide @SystemApi--> + <permission android:name="android.permission.LOCAL_MAC_ADDRESS" + android:protectionLevel="signature" /> + <!-- The system process is explicitly the only one allowed to launch the confirmation UI for full backup/restore --> <uses-permission android:name="android.permission.CONFIRM_FULL_BACKUP"/> |