Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" am: c5680c9b05

am: 16609dfe18

Change-Id: I9c9c500bab98168da48d69cc7e4c93a33b8571bd

diff --combined core/res/AndroidManifest.xml
index 6c25df7,9e7bf27..be2ae60
--- 1/core/res/AndroidManifest.xml
--- 2/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@@ -122,6 -122,7 +122,7 @@@
      <protected-broadcast android:name="android.bluetooth.adapter.action.DISCOVERY_STARTED" />
      <protected-broadcast android:name="android.bluetooth.adapter.action.DISCOVERY_FINISHED" />
      <protected-broadcast android:name="android.bluetooth.adapter.action.LOCAL_NAME_CHANGED" />
+     <protected-broadcast android:name="android.bluetooth.adapter.action.BLUETOOTH_ADDRESS_CHANGED" />
      <protected-broadcast android:name="android.bluetooth.adapter.action.CONNECTION_STATE_CHANGED" />
      <protected-broadcast android:name="android.bluetooth.device.action.UUID" />
      <protected-broadcast android:name="android.bluetooth.device.action.MAS_INSTANCE" />
@@@ -212,7 -213,6 +213,7 @@@
      <protected-broadcast android:name="android.btopp.intent.action.OPEN_INBOUND" />
      <protected-broadcast android:name="android.btopp.intent.action.TRANSFER_COMPLETE" />
      <protected-broadcast android:name="android.btopp.intent.action.ACCEPT" />
 +    <protected-broadcast android:name="android.btopp.intent.action.DECLINE" />
      <protected-broadcast android:name="com.android.bluetooth.gatt.REFRESH_BATCHED_SCAN" />
      <protected-broadcast android:name="com.android.bluetooth.pbap.authchall" />
      <protected-broadcast android:name="com.android.bluetooth.pbap.userconfirmtimeout" />
@@@ -1792,11 -1792,6 +1793,11 @@@
          android:description="@string/permdesc_systemAlertWindow"
          android:protectionLevel="signature|preinstalled|appop|pre23|development" />
  
 +    <!-- @hide Allows an application to set display offsets for the screen.
 +         This permission is not available to third party applications. -->
 +    <permission android:name="android.permission.SET_DISPLAY_OFFSET"
 +        android:protectionLevel="signature|privileged" />
 +
      <!-- ================================== -->
      <!-- Permissions affecting the system wallpaper -->
      <!-- ================================== -->