diff options
author | Michael Chan <mchan@android.com> | 2009-09-01 19:09:28 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-01 19:09:28 -0700 |
commit | ae651048122fa3bccabf2978851cf79ed0a77750 (patch) | |
tree | 9d2a322130292f0016aeda19a0d2618f4d7a53d6 /AndroidManifest.xml | |
parent | 7865507c978fe104deecc702f392d3ff085ff132 (diff) | |
parent | 684736a9d4cc044c6970411485f4c22d5d7e3b74 (diff) | |
download | packages_apps_settings-ae651048122fa3bccabf2978851cf79ed0a77750.zip packages_apps_settings-ae651048122fa3bccabf2978851cf79ed0a77750.tar.gz packages_apps_settings-ae651048122fa3bccabf2978851cf79ed0a77750.tar.bz2 |
am 684736a9: b/2090193 Prevent Bluetooth Pairing Request Dialog from showing in "Recent Apps"
Merge commit '684736a9d4cc044c6970411485f4c22d5d7e3b74' into eclair-plus-aosp
* commit '684736a9d4cc044c6970411485f4c22d5d7e3b74':
b/2090193 Prevent Bluetooth Pairing Request Dialog from showing in "Recent Apps"
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r-- | AndroidManifest.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5c64fa1..7bad62d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -443,6 +443,7 @@ <activity android:name=".bluetooth.BluetoothPairingDialog" android:label="@string/bluetooth_pin_entry" + android:excludeFromRecents="true" android:theme="@*android:style/Theme.Dialog.Alert"> <intent-filter> <action android:name="android.bluetooth.intent.action.PAIRING_REQUEST" /> |