diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-04-14 16:51:47 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2015-04-14 16:51:47 -0700 |
| commit | 5e1d6f595461e27acab14c5c5931d32025c1c18d (patch) | |
| tree | 2abd9416ade86b7b0795e4fdca859ec7a80097f8 /AndroidManifest.xml | |
| parent | 3a7f3dd775e6304636c2238ff58cc1096f5c1a62 (diff) | |
| parent | 165d7facb456fe3c15a07692a70723fda1ad135f (diff) | |
| download | android_packages_apps_Bluetooth-5e1d6f595461e27acab14c5c5931d32025c1c18d.tar.gz android_packages_apps_Bluetooth-5e1d6f595461e27acab14c5c5931d32025c1c18d.tar.bz2 android_packages_apps_Bluetooth-5e1d6f595461e27acab14c5c5931d32025c1c18d.zip | |
am bbb4110..165d7fa from mirror-m-wireless-internal-release
165d7fa MAP: Errata service release 8 changes
5a60e47 Update to Bluetooth MAP 1.2 (server)
0dcecb2 MAP: fix exception when Email in SMS list request
a8873ca Merge "Handle response to AT+NREC command" into m-wireless-dev
345f1ee Add UUIDs to SDP JNI
d1fadc3 Handle response to AT+NREC command
Change-Id: If24e414fe3fd0c2f47147f2535296b92e8066d76
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f0dc03379..990baedb9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -27,6 +27,8 @@ <uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_CONTACTS" /> + <!-- WRITE_CONTACTS is used for test cases only --> + <uses-permission android:name="android.permission.WRITE_CONTACTS" /> <uses-permission android:name="android.permission.READ_CALL_LOG" /> <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <uses-permission android:name="android.permission.WRITE_SETTINGS" /> @@ -226,13 +228,13 @@ android:enabled="@bool/profile_supported_map" > <intent-filter> <action android:name="android.bluetooth.IBluetoothMap" /> - <action android:name="android.btmap.intent.action.SHOW_MAPS_EMAIL_SETTINGS" /> + <action android:name="android.btmap.intent.action.SHOW_MAPS_SETTINGS" /> <action android:name="com.android.bluetooth.map.USER_CONFIRM_TIMEOUT"/> </intent-filter> </service> - <activity android:name=".map.BluetoothMapEmailSettings" + <activity android:name=".map.BluetoothMapSettings" android:process="@string/process" - android:label="@string/bluetooth_map_email_settings_title" + android:label="@string/bluetooth_map_settings_title" android:excludeFromRecents="true" android:configChanges="orientation|keyboardHidden" android:enabled="@bool/profile_supported_map"> |