• Home
  • History
  • Annotate
  • only in /packages/apps/Bluetooth/
History log of /packages/apps/Bluetooth/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
fe19c7f20ca3abc252965be60727e8a198cc6ff3 24-Oct-2014 Matthew Xie <mattx@google.com> When local device originated connection to hid device, move out of quiet mode

bug 17480992

Change-Id: Ia3f5ef4886dfde370abe5b35a80ab80a4f030f37
rc/com/android/bluetooth/hid/HidService.java
c8d240d13c50539e4c857df76d2422e90ac86f17 22-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to cc9c005472000cc2f26361bb66074c31292e10ef
92306e3cc7c758b2d84624aa38465f4dcf40c036 21-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to cc9c005472000cc2f26361bb66074c31292e10ef
cc9c005472000cc2f26361bb66074c31292e10ef 20-Oct-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I52f18022a793f1654570278cc0336234f694a6b6
Auto-generated-cl: translation import
es/values-hi/test_strings.xml
es/values-km-rKH/strings.xml
es/values-ml-rIN/strings.xml
es/values-ml-rIN/strings_pbap.xml
es/values-ml-rIN/test_strings.xml
es/values-mr-rIN/strings.xml
es/values-mr-rIN/strings_pbap.xml
es/values-mr-rIN/test_strings.xml
es/values-my-rMM/strings.xml
es/values-sl/strings.xml
15b1a7eb2571cfff6511fefdda40ebe5ef559a87 20-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 7a306fb7b52cdf99411aaef4c7b44f51a14dc559
90a6c71fc4a9c7fd45fafc3d0a072eaa126e991a 16-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 7a306fb7b52cdf99411aaef4c7b44f51a14dc559
6e4e5b282f0e3b65bf60e3c944a76237a0d5e383 15-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 7a306fb7b52cdf99411aaef4c7b44f51a14dc559
7a306fb7b52cdf99411aaef4c7b44f51a14dc559 15-Oct-2014 Matthew Xie <mattx@google.com> Merge "Update AVRCP play status only if music is streaming" into lmp-dev
11df88466c31512f151986caa43843fe6c201a97 14-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a40ac96c186b6f2105906bb07be45fc8d2ce1436
37050d86141b5e93f5f473771a527bcb03a97795 13-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a40ac96c186b6f2105906bb07be45fc8d2ce1436
8f3b795078d0f78341dbcb552dbc3d3d72775e07 12-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a40ac96c186b6f2105906bb07be45fc8d2ce1436
a40ac96c186b6f2105906bb07be45fc8d2ce1436 10-Oct-2014 Tyler Gunn <tgunn@google.com> Issue: turning on bluetooth headset in call doesn't change route (2/2).

In addition to a failure to report CallState from Telecom, the broadcast
of the state change was happening before the active device was set,
causing Telecom to receive the broadcast indicating the audio state has
changed, only to have the Bluetooth service report that bluetooth audio
is not connected yet.

Bug: 17933664
Change-Id: Id4e7c6d4085f5ee990a8d19da8c089399ee60c6d
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
22bad7047263a6924423d12718738fdcc7b0352c 09-Oct-2014 Ravi Nagarajan <nravi@broadcom.com> Update AVRCP play status only if music is streaming

AVRCP play status was updated based on AVDTP stream state. Enhanced this
logic to update the status only when music is streaming
bug 12099469

Change-Id: Idef0180cd0d0b78fa392a5354320440fce9b81a7
rc/com/android/bluetooth/avrcp/Avrcp.java
f59ee183e3977d96abc494db1e1494fd19ef00d2 09-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to fbb1fe1efa8459f932aed161fbcc0b5e4d52c2d5
fbb1fe1efa8459f932aed161fbcc0b5e4d52c2d5 08-Oct-2014 Tyler Gunn <tgunn@google.com> Moving STATE_DISCONNECTED broadcast.

In Telecom we were seeing a bug where we received an
ACTION_CONNECTION_STATE_CHANGEDSTATE intent indicating the disconnection
of a bluetooth headset. The BluetoothManager in Telecom would then
query the Bluetooth service to see if there are any devices. Despite
being informed that the device in use was disconnected, it still showed
up as connected.

To fix this, I moved the state broadcast AFTER the disconnected device is
removed from the headset state machine. Looking through all other
disconnect broadcasts in that file, the disconnection happens AFTER in
all other cases as well.

Bug: 17899941
Change-Id: Ice4b2a5b1093e04ffe4c3241a3379aba56898792
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
4ebb0071df6adcbad54a3348bf04bdb071e1e6db 08-Oct-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I434b212750272dd181ee6e82046d0a289afe9b90
Auto-generated-cl: translation import
es/values-sw/strings.xml
347c0adc05928eabbf49df6893bc6f97fe6fffae 08-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to b5f2e79b577457084b6aacda765f02980ee413a0
080a74321c1be05d53c4af14c1664572e4639d37 07-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to b5f2e79b577457084b6aacda765f02980ee413a0
b5f2e79b577457084b6aacda765f02980ee413a0 06-Oct-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I20e6d90e2d4e875b6bd4d20cb262b4e5a6b02b67
Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
es/values-my-rMM/strings.xml
2652f29df4d44cf411e15e7630dd68248bbe2efb 06-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 3e48bde09c34a880fe2231022ba64561ab5e4239
3583a536231ec83a3a32544c329191547c24610c 05-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 3d4a54529dd6033c082113b600d945531b759492
3e48bde09c34a880fe2231022ba64561ab5e4239 04-Oct-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I38c13605fc92a6b76ba6bd2dad1aa9aef340cc10
Auto-generated-cl: translation import
es/values-iw/strings.xml
3b9183b8b4205f0d6a5415ae5a009a5c1336533a 02-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to lmp-dev
3d4a54529dd6033c082113b600d945531b759492 02-Oct-2014 Matthew Xie <mattx@google.com> Merge "MAP: Return OBEX_HTTP_NOT_IMPLEMENTED for msgUpdate for sms/mms" into lmp-dev
0bdf4df10c03602f609a1eb23aabe1fe772a89fd 02-Oct-2014 Prem Kumar <premk@google.com> Merge "Add HOGP as hid profile when the remote device contain HOGP service" into lmp-dev
ba4b2f5b1e32e742a130f79ee1a1d0509390c6b3 01-Oct-2014 Matthew Xie <mattx@google.com> MAP: Return OBEX_HTTP_NOT_IMPLEMENTED for msgUpdate for sms/mms

In MAP profile message update is not implemented for sms/mms.
bug 17723738

Change-Id: I6c7baaf9e6f54e7af1b6c8458a6a458239da7d10
rc/com/android/bluetooth/map/BluetoothMapObexServer.java
cd6e77a0f234ae415323f25353f1b2d150401fd5 01-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 335b2b8f6f17c93a4c2b192c8e1b629e48b230b3
b3844610e4285f0d59f4c203bef04896f385d663 30-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 20326a3263b8bd71ea98d5ea88e53cf0f6715d33
d523f01c8adda96876ffc019c9bb8b78e1372be0 30-Sep-2014 Matthew Xie <mattx@google.com> Add HOGP as hid profile when the remote device contain HOGP service

bug 17409862

Change-Id: I018f12facefa7fb7bf2c3b46e639c40a8a67eae4
rc/com/android/bluetooth/btservice/AdapterService.java
335b2b8f6f17c93a4c2b192c8e1b629e48b230b3 29-Sep-2014 PauloftheWest <paulofthewest@google.com> Fixed a Bluetooth MAP bug.

+ Beforehand, if a user disabled MAP and then unpaired the device, then
Settings would automatically deny future MAP requests from the device.

Bug: 17391677
Change-Id: I068f37426ed6a044ed2b5e9391cd9dd00908f867
rc/com/android/bluetooth/map/BluetoothMapService.java
a331e43b4cdccb4e73fa2ddbe5a0f9c0a4daee6c 29-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to acb400b0598107c0427e3fb07b0a4a8fade5481e
20326a3263b8bd71ea98d5ea88e53cf0f6715d33 29-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I19b08d7d4dc62fcc770506724b8bf05262f2d861
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
acb400b0598107c0427e3fb07b0a4a8fade5481e 28-Sep-2014 Matthew Xie <mattx@google.com> Merge "BT MAP: fix problem with fetching CDMA messages" into lmp-dev
3445353297f348c4c70b91fab3a198deece40662 28-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 26a590e91f84c75c58df691c0a57bad223cf7390
e796818505a0b57b225c3aeffc53f580c1e0c66e 25-Sep-2014 kschulz <k.schulz@samsung.com> BT MAP: fix problem with fetching CDMA messages

A bug in Java makes the Long.parse() function throw and exception when message
handles start to become negative (which happens for CDMA SMS messages).
Fix simply shifts the handle masks on byte down in order to get around
the bug.

Bug: 17627572
Change-Id: Ie41aef589dc9d3ecb8bc7167472218e57a52fa33
rc/com/android/bluetooth/map/BluetoothMapUtils.java
8bac89b4ea6617015c3ad1988bf421f165b0283e 25-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to b5b51ca82e3db31705e54687f998b1ea1787396a
26a590e91f84c75c58df691c0a57bad223cf7390 25-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I32bce34d0754b5896ba88a1981a4917a1dbdd25a
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-my-rMM/strings.xml
b5b51ca82e3db31705e54687f998b1ea1787396a 25-Sep-2014 Andre Eisenbach <eisenbach@google.com> Merge "Defer callbacks if the transport is congested" into lmp-dev
adbd46a1d14fb4692316fed8e90dab13b4aae967 24-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 7532f1cdeca345db5a959c6f570bec0f19f0b820
934dee789c0c68607a704c5c31ae2e4b956dc227 19-Sep-2014 Prerepa Viswanadham <dham@google.com> Defer callbacks if the transport is congested

Hold client characteristic write callbacks and server notification
callbacks if the transport is congested. When the congestion clears up,
all queued callbacks are sent to the application.

Bug: 17289507
Change-Id: Ib22d7857ac3990fd3cc922aedd4258013e1af54c
rc/com/android/bluetooth/gatt/CallbackInfo.java
rc/com/android/bluetooth/gatt/ContextMap.java
rc/com/android/bluetooth/gatt/GattService.java
a51c13ae7e6ce56922316a979aef570abafc9f3f 23-Sep-2014 Ariel Gertzenstein <agertzen@google.com> Set FLAG_RECEIVER_FOREGROUND when broadcasting
ACTION_PAIRING_REQUEST.

Bug: 17590080

Change-Id: I0a7cde5953f706a2b41b02878f0fdbd2d9e8ae35
rc/com/android/bluetooth/btservice/BondStateMachine.java
afe3849d19ef8bd7aa0131e0679d41ce22b5f582 23-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 7532f1cdeca345db5a959c6f570bec0f19f0b820
c623209e95fd4c03a780c2885c2b1bdcbd0acb27 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 7532f1cdeca345db5a959c6f570bec0f19f0b820
5719cef0ac77e93dc1693895ab56d76c5f0f8b1a 21-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 7532f1cdeca345db5a959c6f570bec0f19f0b820
29e7e63056fc3fd6b111b37418e9a518bfe33513 21-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to d5f9461adf96d63ab6accc91e126cd0223fd9620
7532f1cdeca345db5a959c6f570bec0f19f0b820 20-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I4a80e21aff0f05f77f37f48a042125fb642d71f9
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-mr-rIN/strings.xml
es/values-pt/strings.xml
e951a9588bea7d4a4e1116907c0bc4b62b0a31c5 20-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 94023bd851cb80966d8f8006702d318057c83f09
94023bd851cb80966d8f8006702d318057c83f09 19-Sep-2014 Matthew Xie <mattx@google.com> Merge "Save alias in RemoteDevice property before passing it to native layer" into lmp-dev
74277677d2a51d7c8ff60a778889f71e69763c21 18-Sep-2014 Matthew Xie <mattx@google.com> Save alias in RemoteDevice property before passing it to native layer

bug 17287682

Change-Id: Id7da194f66cf44d41e60f35665dfb1b279cac28f
rc/com/android/bluetooth/btservice/RemoteDevices.java
d876e29eadbee94fe9933b961e6363ac6e337d90 18-Sep-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into lmp-dev
d5f9461adf96d63ab6accc91e126cd0223fd9620 18-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 00ab61e21fd553620a466389907cb4dc089bb221
00ab61e21fd553620a466389907cb4dc089bb221 18-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Use unified Tethering Permission Check" into lmp-dev
e08a0eeb9cbf0ee732171d1c1d353aecdad0a7d2 17-Sep-2014 Wei Wang <weiwa@google.com> Fix a typo that compares scanMode with callback types.

Bug: 17187159
Change-Id: Ieca583e7cf02d63b9eceda7872511c9db280c04a
rc/com/android/bluetooth/gatt/GattService.java
620ff342d30c30306d1aa73ec65e209dd3141ff0 17-Sep-2014 Rakesh Iyer <rni@google.com> Merge "Don't leak PII into the logs." into lmp-dev
ab880c1e01cbf0f7c5283b2794631407fceaa0de 17-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 33a06059be8506003003e41ec020bdce273da1a1
33a06059be8506003003e41ec020bdce273da1a1 17-Sep-2014 Wei Wang <weiwa@google.com> Merge "Enforce permissions for BLE hidden APIs." into lmp-dev
8e6c4bcf8f2275db33c7886b34eea0a6da427d08 17-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> Use unified Tethering Permission Check

The BT and Wifi mechanisms for enabling Tethering did their own
permission checks. This set of changes unifies the check into
a ConnectivityManager function so they can be kept in sync.

bug:17435527
Change-Id: I8c157a5acf56ffbddd349cb6a45160ae7be8541b
rc/com/android/bluetooth/pan/PanService.java
02fc1acb99dbf3ae0a710ee7e4b6de8dd779e84e 17-Sep-2014 Rakesh Iyer <rni@google.com> Don't leak PII into the logs.

Guard a couple of the Log.v statements with the if (V) guard that
is used everywhere else in the file.

Bug: 17531755
Change-Id: I7ea06333132c400fca225d0c92cfca0d6c3024ab
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
c79c883e80ee08c2c0e55709916cd4bc416c019a 16-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I7a5f2128cf036e9e60bf6d37198748e80d6a380c
Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-fi/strings.xml
es/values-hr/strings.xml
es/values-hy-rAM/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tr/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
293d74469a1f4ad526d282f43a5947f129cd159a 16-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 699bc55e42eddd29889ab0e45d795c9a91a67662
699bc55e42eddd29889ab0e45d795c9a91a67662 16-Sep-2014 Edward Jee <edjee@google.com> Merge "Migrates PBAP and MAP access permission data from Settings to Bluetooth." into lmp-dev
901fc26af77bd2d0a82fe7b8e47a2fafb622811e 15-Sep-2014 PauloftheWest <paulofthewest@google.com> Bluetooth now properly saves A2DP status.

Bug: 17115629
Change-Id: I5e9bc4d492a9714a87b15d131b25cf9a5a0aeecd
rc/com/android/bluetooth/btservice/AdapterService.java
fc9bed1b79edf77082f5baa21aa68d791a102ea4 05-Sep-2014 Edward Jee <edjee@google.com> Migrates PBAP and MAP access permission data from Settings to Bluetooth.

Currently, users' preference in phonebook and call history or message
access per each Bluetooth-paired device is stored in Settings application's
shared preferences.

However, some privileged applications other than Settings need to access
such data. So we decided to migrate the data from Settings application's
shared preferences to Bluetooth application's.

Bug: 17158953
Change-Id: I3808891cdcce84aa0d4df31f998c9f1240159d95
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/hfp/AtPhonebook.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
rc/com/android/bluetooth/map/BluetoothMapService.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
b63b28f892d57787fe032452b2ea2cc40e125e6a 15-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 7d196f2611947cabe40f753e1484384a814d5aea
7d196f2611947cabe40f753e1484384a814d5aea 15-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I336ef7e2b1d86dedf448c471725e421363bd444c
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rCN/strings_pbap.xml
es/values-zh-rCN/test_strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
6dc9979ab34479ef9c9bce7386236ab8261e9545 14-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 1cd7be76ea6af37476df0cc28e19248d94be4bfa
2b2c0aef5c456411b4f7f071c14974085df0e914 13-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 3ae3e8a1fafb930bdb84e8ff3b1bf8f98d1a306d
190ed40d20cd11dc4d4b8a9267259b530454ea44 13-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 1cd7be76ea6af37476df0cc28e19248d94be4bfa
1cd7be76ea6af37476df0cc28e19248d94be4bfa 13-Sep-2014 Wei Wang <weiwa@google.com> Merge "Do not reuse all pass filter index." into lmp-dev
6ef76fa25c1de11cbb5ae35d645c68584f680ac8 12-Sep-2014 Wei Wang <weiwa@google.com> Enforce permissions for BLE hidden APIs.

Bug:17187159
Change-Id: Ibe467fa52fdead036a80922947cc295257221530
rc/com/android/bluetooth/gatt/GattService.java
8b17c7f2f98bbea105a41a0bb962a4581b7cce5c 10-Sep-2014 Casper Bonde <c.bonde@samsung.com> MAP: Workaround for missing size values in message data base

Not all messages in the MMS/Email message data bases have
the size/attachment size attribute set.

This causes MAP clients to behave wrongly, e.g. they
request to exclude attachments if the attachments size
is 0. Even for messages which actually have attachments.

The attachment size is the only way for MAP clients to
know if attachments are present, hence the behavior of
the client is not wrong.
bug 17389452

Change-Id: I82cd76bc044601eb6e8b190d0c6fc41b51410a93
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
rc/com/android/bluetooth/map/BluetoothMapContent.java
7ac43d2e29e3405b4df2e9ebd947ae7a9d10e8a0 11-Sep-2014 PauloftheWest <paulofthewest@google.com> Merge "Applied Material theme to Bluetooth file acceptance dialog." into lmp-dev
3ae3e8a1fafb930bdb84e8ff3b1bf8f98d1a306d 11-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 711d604b79f811f2fdeaae57bd4d5e31f3052747
711d604b79f811f2fdeaae57bd4d5e31f3052747 11-Sep-2014 Ang Li <angli@google.com> Merge "Change broadcast ACTION_CONNECTION_ACCESS_REQUEST to be ordered." into lmp-dev
addfd25b639047e8463772b14f249758bdb20fbc 10-Sep-2014 PauloftheWest <paulofthewest@google.com> Applied Material theme to Bluetooth file acceptance dialog.

Bug: 17334507
Change-Id: I36d3ef5575ad84a27cda415c1d0e262f097e98a7
es/layout/incoming_dialog.xml
es/values/strings.xml
es/values/styles.xml
rc/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
af5df2070741a4720abf61821fc217995b29101a 10-Sep-2014 Andre Eisenbach <eisenbach@google.com> Merge "Pairing failed after 50 attempts" into lmp-dev
5e04b5baa54a7b760cd1f4360ded31fead99d7d0 10-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 4d3f577e6896449b8162983d17dd2b4a771623e2
4d3f577e6896449b8162983d17dd2b4a771623e2 10-Sep-2014 Prem Kumar <premk@google.com> Merge "BT-HF: Disable Multi HF feature." into lmp-dev
44050ef0ada13303fc7d37f157b1afcf1c1da573 05-Sep-2014 Nitin Arora <niarora@codeaurora.org> BT-HF: Disable Multi HF feature.

Disable Multi HF feature by allowing max hf connections = 1
in HeadsetStateMachine.
bug 17321509

Change-Id: Ia477c728bfb1457def7f302d5533ce63446dffc7
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
11b41d8123241ba8e693e21c4db308bacff23f57 29-Jul-2014 Mudumba Ananth <ananthm@broadcom.com> Pairing failed after 50 attempts

-> The issue was caused due to delayed message sent for
bond_state_changed_callback in BondStateMachine and RemoteDevices
was sending the pairing request(sspRequestcallback) intent to the Settings APP
before even the bond state is changed.
-> Moved the SSPRequestCallback and PinRequestCallback to BondStateMachine
to synchronize the above two callbacks using a single message
queue in the BondStateMachine message handler.
-> Changed the pending command state to accept the SSP_REQUEST
and PIN_REQUEST messages and send the intents.

Bug: 16560957
Change-Id: I8372bdd2e96aa09215f2f1e98d6eed4e892637e6
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/btservice/JniCallbacks.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
7eed33efe211ba8129fdecbfe0d8053a5473d906 09-Sep-2014 Jeff Davidson <jpd@google.com> Merge "Make directory structure + Java packages consistent." into lmp-dev
8c8dee25f9640f99aebef9f40da0d95de9dfa770 09-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 5ca43226937e098a2404d61de3f991af5c6a2689
beb0497605ef61062d0565d85897f4c842845a8f 09-Sep-2014 Ang Li <angli@google.com> Change broadcast ACTION_CONNECTION_ACCESS_REQUEST to be ordered.

Making this broadcast ordered makes it possible to be intercepted
before Settings get it. This is cruicial to Android Audo's use case
and test automation.

The previous change we put in:
https://googleplex-android-review.git.corp.google.com/#/c/499135
was accidentally overwritten by
https://googleplex-android-review.git.corp.google.com/#/c/503267

We are putting this change back in, and making similar changes for
PBAP and HFP.

Change-Id: Ia9b4c22a05d0c9beb1485b53ddf04c45fa210526
rc/com/android/bluetooth/hfp/AtPhonebook.java
rc/com/android/bluetooth/map/BluetoothMapService.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
2b9ac142e56cf6a6cc0572fb75f8a5ce40894f8b 05-Sep-2014 Wei Wang <weiwa@google.com> Do not reuse all pass filter index.

Bug:17425379
Change-Id: Iba4c40f8822b182718db060c3f2eeff7aabdb286
rc/com/android/bluetooth/gatt/ScanManager.java
6f0bc80f8e4423be28a41632c0a71e88c44e02e7 08-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 5ca43226937e098a2404d61de3f991af5c6a2689
0454f7a2a6cb28ce1fed368b1670de92f41d2530 07-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 5ca43226937e098a2404d61de3f991af5c6a2689
34747f5d56c1367848f1a2d09581dd1f410f6e8d 06-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 717be4e8209e4c24d8a1e395f65f86aee5bb0e69
5ca43226937e098a2404d61de3f991af5c6a2689 05-Sep-2014 Wei Wang <weiwa@google.com> Merge "Fixed batch scan returning status 12 when restarted." into lmp-dev
96509d5ff7109bc42a4c25143f70ec41a127d109 03-Sep-2014 Wei Wang <weiwa@google.com> Fixed batch scan returning status 12 when restarted.

Also fixed no batch scan results when both truncated and
full batch are enabled.

Added a BatchScanParams to hold parameters for batch scan.

Bug:16850169
Bug:17213118
Change-Id: Ib3bb7442aa2657912ef4377f825388ac8e1010bb
rc/com/android/bluetooth/Utils.java
rc/com/android/bluetooth/gatt/AdvertiseManager.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/ScanManager.java
ab10811e960ed0a5c6098467b2184895831f33ac 05-Sep-2014 Prerepa Viswanadham <dham@google.com> Return right connection status when connection failed

bug: 17326529
Change-Id: I57abf2f6a98c469248613ea386f0fa2ffaf5eac4
rc/com/android/bluetooth/gatt/GattService.java
717be4e8209e4c24d8a1e395f65f86aee5bb0e69 29-Aug-2014 Andre Eisenbach <eisenbach@google.com> Protect against Bluetooth share crash because of invalid timer callback

If the timer callback is not set when fired, a SIGSEGV will ensue. This
patch checks to make sure the callback is set before invoking the
function.

Bug: 17307367
Change-Id: I2ee284bdbd3b54a368e373d9ac9e6e47205dcff6
ni/com_android_bluetooth_btservice_AdapterService.cpp
76b4771991363ff69a099f483362805e4df63836 29-Aug-2014 Andre Eisenbach <eisenbach@google.com> Merge "redirect the ff/rw key event to ff/rw enabled player" into lmp-dev
b8bc0231e0074d923d7d961548d407babd41eb79 29-Aug-2014 Wei Wang <weiwa@google.com> Merge "More precise control of batch alarm." into lmp-dev
b4326c19eafb1d4437a82973b9019274e1e07aed 28-Aug-2014 Selim Cinek <cinek@google.com> Merge "Colored notifications" into lmp-dev
efbb85824de09776725d264cd872ccbedcc8b42b 28-Aug-2014 Matthew Xie <mattx@google.com> Merge "Listen for phone state on connect instead of SLC" into lmp-dev
3bfba36385f686ef63445dbecb627030573a04fd 21-Aug-2014 Wei Wang <weiwa@google.com> More precise control of batch alarm.

Use setWindow instead of setRepeating for alarms.
SetRepeating is inexact and the alarm can be triggered quite randomly,
while setWindow gives more precise control of trigger time.

Also unregister alarmReceiver during cleanup to avoid leak of
IntentReceiver.

Bug: 16689485, Bug:16826684
Change-Id: I5245e1424aad3c11ab5ce8a7393031e9d4f1dd03
rc/com/android/bluetooth/gatt/ScanManager.java
881675b362bde18acbbcf69c513175addca4a8ba 27-Aug-2014 Zhenye Zhu <zhenye@broadcom.com> redirect the ff/rw key event to ff/rw enabled player

Added code to cleanup the forward/rewind
event queue and redirect the key event to
the ff/rw enabled player
Bug 16890205

Change-Id: If09c0693621d9f36fb7dc14177597e30450b87b6
rc/com/android/bluetooth/avrcp/Avrcp.java
0ce48bf302e010af811c903f8a986df567562ecf 27-Aug-2014 Selim Cinek <cinek@google.com> Colored notifications

Bug: 17128331
Change-Id: Ic1a4d9803790cc0f3e8003ede4da8cc8f26729cf
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
7c405bac41fc4ebb5c9cc7b5c896b023f7b1e9fc 25-Aug-2014 Prerepa Viswanadham <dham@google.com> Set batch scan params based on scan settings.

bug 17134263

Change-Id: Id0d314ad1c14ad20e32830ae2c8ad5f80765b28b
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/ScanManager.java
8e00c15a0c32c9bc7dab5038edf24bb418f181ef 19-Apr-2013 Ravi Nagarajan <nravi@broadcom.com> Listen for phone state on connect instead of SLC

Phone state listener changed to start on connect. This gaurantees
that the CIND response as part of SLC reflects the right indicator
values
bug 17020870

Change-Id: I47989643600edfa4d4e422998c3a644a7f7556b9
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
d085022e6bc3af68c196f3173c1bb6971a1e30be 26-Aug-2014 Baligh Uddin <baligh@google.com> am 28d13bff: (-s ours) am bbea2cec: (-s ours) Import translations. DO NOT MERGE

* commit '28d13bff5306fa45e41d7ea675aafe9e8a1113f4':
Import translations. DO NOT MERGE
049a22bb30f20287674b2acf329cd7bf972379ea 25-Aug-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into lmp-dev
d54785926fc0150661b6e70d5d0dabef87be3d73 25-Aug-2014 Wei Wang <weiwa@google.com> Merge "Fix API council review comments. Also hide certain APIs(2/3)." into lmp-dev
24cb4d5082f4568074e5d1f375027a219aa40be7 24-Aug-2014 Wei Wang <weiwa@google.com> Merge "Fix race condition when advertising app dies." into lmp-dev
8cd43bc5943043e1da272fce852f8b8b8d738133 24-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I6029a797339c39be20b2f31c59fcfac91d1fbb4b
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
es/values-my-rMM/strings.xml
es/values-my-rMM/strings_pbap.xml
es/values-my-rMM/test_strings.xml
28d13bff5306fa45e41d7ea675aafe9e8a1113f4 22-Aug-2014 Baligh Uddin <baligh@google.com> am bbea2cec: (-s ours) Import translations. DO NOT MERGE

* commit 'bbea2cec7b27babcd06dc8ade731978d19e79e7b':
Import translations. DO NOT MERGE
bbea2cec7b27babcd06dc8ade731978d19e79e7b 22-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I8d26c9d88113963727edee77423cfbcd50742ce6
Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
f9a51c08a1acf9a70a3e49f89f543b309822bd97 21-Aug-2014 Andre Eisenbach <eisenbach@google.com> Merge "LE: Rename new MTU and connection paramter update APIs" into lmp-dev
039bf1606bddb3794fd6aa9adee704733f89544f 12-Aug-2014 Wei Wang <weiwa@google.com> Fix race condition when advertising app dies.

Bug: 16565960
Change-Id: Ica801a1186e62fcba666deabe5989dd47d404b68
rc/com/android/bluetooth/gatt/AdvertiseClient.java
rc/com/android/bluetooth/gatt/AdvertiseManager.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/ScanClient.java
rc/com/android/bluetooth/gatt/ScanManager.java
1dc1aab071533430ff1a0cfe1aa49e5f954f3518 20-Aug-2014 Andre Eisenbach <eisenbach@google.com> LE: Rename new MTU and connection paramter update APIs

bug 17005342
Change-Id: Ic773b5c4bb3da9777613c8094ad21ea6f720110d
rc/com/android/bluetooth/gatt/GattService.java
ecbfd7771dd2ee7665f7fc18bf869e480c6f5449 12-Aug-2014 Lorenzo Colitti <lorenzo@google.com> Stop using LinkProperties for static configuration.

Bug: 16114392
Bug: 16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
rc/com/android/bluetooth/pan/BluetoothTetheringNetworkFactory.java
0bec7f6b6f3062bcc3a4e4eeee4d5b2bd59698d8 17-Aug-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into lmp-dev
95ebcecc6037a6a424d0810d6a2498603932b1e9 16-Aug-2014 Baligh Uddin <baligh@google.com> am b35d0599: (-s ours) am 2396c919: (-s ours) Import translations. DO NOT MERGE

* commit 'b35d0599bc5846886913147aff52ddd8ee6b05ff':
Import translations. DO NOT MERGE
f1e73877d525254dd50366c36f94b2bec4d34176 16-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Icaaa618e7c4b13fda5ff936aebfe02ee1e4f277c
Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-es-rUS/strings.xml
es/values-eu-rES/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings_pbap.xml
es/values-hi/test_strings.xml
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
es/values-kn-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-my-rMM/strings_pbap.xml
es/values-my-rMM/test_strings.xml
es/values-ro/strings.xml
es/values-si-rLK/strings.xml
es/values-sl/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
b35d0599bc5846886913147aff52ddd8ee6b05ff 16-Aug-2014 Baligh Uddin <baligh@google.com> am 2396c919: (-s ours) Import translations. DO NOT MERGE

* commit '2396c919e3eba633feb37a84bd195bfde5f48629':
Import translations. DO NOT MERGE
db0920ed7d9ef5385e36dfa922f351e4e6556a3e 15-Aug-2014 Wei Wang <weiwa@google.com> Fix API council review comments. Also hide certain APIs(2/3).

b/17006825

Change-Id: I6c0e739e44f8a9d26f3f2b03937b38d4dec893e7
rc/com/android/bluetooth/gatt/AdvertiseManager.java
2396c919e3eba633feb37a84bd195bfde5f48629 15-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I3ca5afbffa0ddc43dde3bd614bb8e099550c086a
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-hi/strings_pbap.xml
es/values-hi/test_strings.xml
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
es/values-sw/strings.xml
es/values-th/test_strings.xml
es/values-zh-rCN/strings.xml
03f23ee7d3868e97ec7ed1a3d81c149b5b0ebd69 13-Aug-2014 Wei Wang <weiwa@google.com> Add protection before cleaning up adv and scan manager.

b/16845251

Apparently for GattService stop and cleanup could be called before start
is even called.

Change-Id: Id0ac2e68da504f79160264012a0cdf5127eccfc7
rc/com/android/bluetooth/gatt/GattService.java
d560c8b00c9c4043687ba6eaee01753c3b7c4717 13-Aug-2014 Wei Wang <weiwa@google.com> Merge "Use nanos instead of micros in BLE scan." into lmp-dev
13ef8d8ea956b9c88888f123edb3d76e9810a293 11-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I534010963a83e71abf460bdf8771c38dce895d8c
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
55a7eff213d57dd0ff948d441edb16f4a6ae2ea6 11-Aug-2014 Wei Wang <weiwa@google.com> Use nanos instead of micros in BLE scan.

Change-Id: Ifdaf101f92ae4c8d2bcecf62a1942961d6610151
rc/com/android/bluetooth/gatt/GattService.java
31db28fcd2e2e1840e03b4bff7f121ed6dd47344 08-Aug-2014 Jeff Davidson <jpd@google.com> Make directory structure + Java packages consistent.

Fixes Eclipse compilation errors.

Change-Id: I2898a2aaf2b19b4c64fd523f792bb224c79b5d75
ndroid.mk
ib/mapapi/BluetoothMapContract.java
ib/mapapi/BluetoothMapEmailProvider.java
ib/mapapi/com/android/bluetooth/mapapi/BluetoothMapContract.java
ib/mapapi/com/android/bluetooth/mapapi/BluetoothMapEmailProvider.java
0d8f1ae3e070d7a13f8e482895bcab428a6c8381 08-Aug-2014 Wei Wang <weiwa@google.com> Merge "fix build." into lmp-dev
c1d460a4ee15238f33e9c2a61b571965accf9838 08-Aug-2014 Wei Wang <weiwa@google.com> fix build.

Change-Id: I034cc118ea4dca67ed6240b700d4ac504562ddfc
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/ScanClient.java
c43ce5118eab93469e31d56ee30043e5e011fa89 07-Aug-2014 Wei Wang <weiwa@google.com> Fix build.

Change-Id: Ied3bd289b662cd342ba05f5038175007d3211a63
rc/com/android/bluetooth/gatt/GattService.java
50cc9194f72c040f04c2ae0f0322246a570e8bfa 07-Aug-2014 Prerepa Viswanadham <dham@google.com> OnFound/Lost reporting: s/w detects the first match and
hw signal is used to report onlost.

Bug 16733710

Change-Id: I4d1d0320b6894fe1af59192eb56a4a801609049a
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/ScanClient.java
rc/com/android/bluetooth/gatt/ScanManager.java
755ef770144daf1a0fbbabaa310bc300190dfd9c 08-Aug-2014 Andre Eisenbach <eisenbach@google.com> Merge "LE: Add limited advertising duration capability (3/3)" into lmp-dev
c1512abbe9bb60c94c5f46e90918983d1514c8e3 08-Aug-2014 Andre Eisenbach <eisenbach@google.com> LE: Add limited advertising duration capability (3/3)

Change-Id: Ib025d8a10cce07e8f731c005d963245aa988be73
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/AdvertiseManager.java
5f8b46c673e2b862ab7ff7280915e89578bbd06e 07-Aug-2014 Wei Wang <weiwa@google.com> Merge "Clear pending data and allow all filter when batch stopped." into lmp-dev
00975169ba4eb5251397a66532ee9a3288c0f137 05-Aug-2014 Wei Wang <weiwa@google.com> Clear pending data and allow all filter when batch stopped.

Also send batch data to multiple clients for full batch.

b/16802098

Change-Id: Ife1723b818531fcf2cff897686f33f6b0a1d0aaa
rc/com/android/bluetooth/gatt/AdvertiseManager.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/ScanManager.java
326b5e610063ac24c0ba467ac585bd4c7f618a67 24-Jul-2014 Casper Bonde <c.bonde@samsung.com> BT MAP: added support for email sharing over BT

- added support for Emails
- added activity to do setup of the email accounts to share
- added improved handling of MMS, SMS and Email
- Many optimizations to speed (especially getMessageListing)
- fixed wakelock problem
- fixed user timeout problem when user do not react to msg access request
- added missing privileges
- support for Quoted Printable format
- added accountId in test case URIs
- fixed problem with service numbers being strings
- fixed problem with read flag in getMessage
- added support for transparent flag in Email Push
- added missing send-event for non-imap accounts
- set attachment size to 0 if text-only message
- fixed double send for sms messages with retry
- removed secondary phone numbers from recipient/originator
- removed insert-address-token in MMS messages
- fixed null-pointer exception in settings (missing extra in intent)
- send text-only mms as sms (workaround to make it cheaper)
- fixed rejection of native and fraction requests
- better handling of unknown message types in push
- fixed problem with possible illigal xml chars in message listing
- added missing WRITE_APN_SETTINGS permission to manifest
- fixed problem with notifications when pushing to folders other than OUTBOX
- removed debugging code
- added support for threadId
- fixed permission problems
- changed to use ContentProviderClients for Email app access
- fixed names for member vars

UPDATE: Moved the MAP E-mail API to the bluetooth package.

UPDATE: Added check for the presense of MMS parts.
This is needed due to a change in the MMS app/subsystem,
where deleted messages gets corrupted.

Signed-off-by: Casper Bonde <c.bonde@samsung.com>
Change-Id: Ib5dbe7c2d5c0ba8d978ae843d840028592e3cab4
ndroid.mk
ndroidManifest.xml
ib/mapapi/BluetoothMapContract.java
ib/mapapi/BluetoothMapEmailProvider.java
es/layout/bluetooth_map_email_settings.xml
es/layout/bluetooth_map_email_settings_account_group.xml
es/layout/bluetooth_map_email_settings_account_item.xml
es/layout/bluetooth_transfer_item.xml
es/values/strings.xml
rc/com/android/bluetooth/map/BluetoothMapAppParams.java
rc/com/android/bluetooth/map/BluetoothMapAuthenticator.java
rc/com/android/bluetooth/map/BluetoothMapContent.java
rc/com/android/bluetooth/map/BluetoothMapContentObserver.java
rc/com/android/bluetooth/map/BluetoothMapEmailAppObserver.java
rc/com/android/bluetooth/map/BluetoothMapEmailSettings.java
rc/com/android/bluetooth/map/BluetoothMapEmailSettingsAdapter.java
rc/com/android/bluetooth/map/BluetoothMapEmailSettingsDataHolder.java
rc/com/android/bluetooth/map/BluetoothMapEmailSettingsItem.java
rc/com/android/bluetooth/map/BluetoothMapEmailSettingsLoader.java
rc/com/android/bluetooth/map/BluetoothMapFolderElement.java
rc/com/android/bluetooth/map/BluetoothMapMasInstance.java
rc/com/android/bluetooth/map/BluetoothMapMessageListing.java
rc/com/android/bluetooth/map/BluetoothMapMessageListingElement.java
rc/com/android/bluetooth/map/BluetoothMapObexServer.java
rc/com/android/bluetooth/map/BluetoothMapService.java
rc/com/android/bluetooth/map/BluetoothMapSmsPdu.java
rc/com/android/bluetooth/map/BluetoothMapUtils.java
rc/com/android/bluetooth/map/BluetoothMapbMessage.java
rc/com/android/bluetooth/map/BluetoothMapbMessageEmail.java
rc/com/android/bluetooth/map/BluetoothMapbMessageMms.java
rc/com/android/bluetooth/map/BluetoothMapbMessageMmsEmail.java
rc/com/android/bluetooth/map/BluetoothMapbMessageSms.java
rc/com/android/bluetooth/map/BluetoothMnsObexClient.java
ests/Android.mk
ests/AndroidManifest.xml
ests/src/com/android/bluetooth/tests/BluetoothMapbMessageTest.java
475a4f7727a082ccf289ce406e75c463750a515c 05-Aug-2014 Wei Wang <weiwa@google.com> Workaround for reversed mac addresses in batch scan.

b/16803363

Change-Id: I47299ed2a6191e7f05c229feb1f1f0424e486907
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/ScanManager.java
f021c4ee6ba53c8512807c1469b2432278cf6cca 05-Aug-2014 Andre Eisenbach <eisenbach@google.com> Merge "Add transport parameter to createBond() function (3/4)" into lmp-dev
db681f3973bd8a088a878fd6f41d4330cdbc5522 05-Aug-2014 Andre Eisenbach <eisenbach@google.com> Add transport parameter to createBond() function (3/4)

Change-Id: Id3c59bcc8f9efb20fffdebaff34d6b2593f5e5ca
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
62fb56f2ba7d998e3e7416fc19d25ea91cc85111 04-Aug-2014 Matthew Xie <mattx@google.com> Check null mHandler condition before invoking method on it

There is a path that clean up is called before stop call on HealthService
mHandler could be set to null
bug 16784750

Change-Id: Ie931fa502cf82d21c6bf97a8dc7035e5a1ed4b2e
rc/com/android/bluetooth/hdp/HealthService.java
a08ff547783c43175c90ed8bd3e4db53482b3dde 30-Jul-2014 Nitin Srivastava <nitinsr@codeaurora.org> MHF: Return the correct connection state for headset.

When more than 1 headset is connected, return the correct
connection state for a headset other than latest connected
headset.
bug 16514538
Change-Id: Id07165f2c023959b7a457a1c1c0ed5c227838973
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
97600f2df10fbbe1810141e1c4ef7091a6a55abe 03-Aug-2014 Wei Wang <weiwa@google.com> Change discard rule.

Change-Id: Icfc43371acb0e901a7f67a4c32c5dd2e63de49c3
rc/com/android/bluetooth/gatt/ScanManager.java
18999c2cfd477050de0ca88c3a73458235d82656 30-Jul-2014 Wei Wang <weiwa@google.com> Add a default impelementation of IBluetoothGattCallback(2/2).

b/16636127 Explicitly use UTF-8 for ScanRecord's local name

Change-Id: Ib152239cdee0becf3f49f1b610dfe1c2296c3647
rc/com/android/bluetooth/gatt/AdvertiseManager.java
rc/com/android/bluetooth/gatt/GattService.java
7dca73a9bdbdbbea93bb0b6150702d21c533b229 01-Aug-2014 Wei Wang <weiwa@google.com> Merge "Change service data and manufacturer data to be repeated." into lmp-dev
e34b91565499994a4b04a1014432c8f90678972a 30-Jul-2014 Wei Wang <weiwa@google.com> Change service data and manufacturer data to be repeated.

Change-Id: Ie45ca40d3d84d192d65003ea3ac9ad428b281f94
rc/com/android/bluetooth/gatt/AdvertiseManager.java
rc/com/android/bluetooth/gatt/ScanManager.java
5a95154a384076ae9ff43e79ae30085327e53cec 31-Jul-2014 Yicheng Fan <yichengfan@google.com> Merge "Remove client from advertiseManager correctly" into lmp-dev
61b76fd94c45ee1909cde1d08a643fc031ef287f 31-Jul-2014 Yicheng Fan <yichengfan@google.com> Remove client from advertiseManager correctly

Bug: 16711409
Change-Id: I3881593818edcf822ec07353da4a5ea6970f5d7c
rc/com/android/bluetooth/gatt/AdvertiseManager.java
3548bc374efdb3cc93d6856e71353291a90fd4a7 31-Jul-2014 Prerepa Viswanadham <dham@google.com> Reduce batch supported threshold to 1024 bytes

b/16680086

Change-Id: I671abd7dba321ab111280d1a1cb27aa93635a6d1
rc/com/android/bluetooth/btservice/AdapterService.java
f2f2e89a583d764066c4a84b3d5de5201310202b 31-Jul-2014 Prerepa Viswanadham <dham@google.com> Incorrect data type
bt_local_le_features_t of wrong size

b/16653133

Change-Id: Ifade7add084fcfbef60abb7d8e5d47e619b0e812
rc/com/android/bluetooth/btservice/AdapterProperties.java
f254208ae7231d227f4dd9f361d38d161bbecb97 29-Jul-2014 Wei Wang <weiwa@google.com> Merge "Combine manu id and data before setting to stack." into lmp-dev
5b79bdb4b17c09a17db7634d15e1d6b56bca6c48 29-Jul-2014 Prerepa Viswanadham <dham@google.com> Bug 16630976 - Fix for LE Scan not working

Change-Id: I287ff92b699bc798a7d208deed67bc4dce8e1af7
rc/com/android/bluetooth/gatt/ScanManager.java
a1feac750a78ef35ff83e381ca421d9c68c49673 28-Jul-2014 Wei Wang <weiwa@google.com> Fix build due to removal of configureScanParams.

Change-Id: If3458b47bb9dfc508e630fe1fb608f01c44284a9
rc/com/android/bluetooth/gatt/GattService.java
e0a211b1c15672734e329390cb2f04ca006b59bd 26-Jul-2014 Prerepa Viswanadham <dham@google.com> Refactor configuring scan params to scan manager

Change-Id: I8c60f0fa4307c2833bc5da6cd080515c5b16b652
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/ScanManager.java
466e67f34a72bbb43fa03aae7ad96cb41f02451d 27-Jul-2014 Wei Wang <weiwa@google.com> Fix service data filter and report delay issue.

Change-Id: I1e4dd400c94f8740e4e950c42be6beac858f3ab8
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/ScanFilterQueue.java
rc/com/android/bluetooth/gatt/ScanManager.java
bebb0fe84fe06a47bd88cdfb9cba8ffe4d2c463a 26-Jul-2014 Wei Wang <weiwa@google.com> Combine manu id and data before setting to stack.

Change-Id: Idef33daa87939a0533dae37dad53a827155d79ca
rc/com/android/bluetooth/gatt/AdvertiseManager.java
be3bd22d6f96ddce0e5d42bf25d1c8acf35addfe 25-Jul-2014 Wei Wang <weiwa@google.com> Merge "Use scanner for lagacy LE scan (2/2)." into lmp-dev
2609a11670563837625f7dde2192deaba7417e46 24-Jul-2014 Andre Eisenbach <eisenbach@google.com> Fix A2dp crash when re-starting Bluetooth services

When the Bluetooth process has died, the services will be restarted to
recover from a crash. This could cause an exception in the A2dp service
because the service maybe stopped without having successfully been
started before. Added null-check to prevent an exception during the
restart.

Bug: 16529242
Change-Id: I57c99ec72c0ba09c6c5325b262e83618aacb3e39
rc/com/android/bluetooth/a2dp/A2dpService.java
86c292ab0f0fed25345a2eaef0fd92ff9c72a9e5 24-Jul-2014 Wei Wang <weiwa@google.com> Use scanner for lagacy LE scan (2/2).

Change-Id: I273e7a2b6687f38d051c3264ff1bbb0025507820
rc/com/android/bluetooth/gatt/AdvertiseManager.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/ScanManager.java
d981566d5912bfd66fc265508e5b0c43dce76f82 23-Jul-2014 Prerepa Viswanadham <dham@google.com> Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting

Change-Id: Icff519c6e91d7a9a2fb5bd462daddb6a79f9bb46
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/AdapterService.java
f6eff2b71e9bc206f995e847e384507fb1c3e239 19-Jul-2014 Prerepa Viswanadham <dham@google.com> LE energy info feature

Java and JNI changes for energy info feature

Change-Id: Ifdc7b7253aea8c610b2dac90f2b3f525b5e2d73f
ni/com_android_bluetooth_btservice_AdapterService.cpp
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/AdapterService.java
9c24a0ef159f3332a2e66648d8d3c7dfac26cbc8 22-Jul-2014 Wei Wang <weiwa@google.com> Add a ScanManager that handles Scan related operations. Remove
GattServiceStateMachine.

Change-Id: I03afefaa4ba534abbf8e2bd38b4888020764cb22
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
rc/com/android/bluetooth/gatt/ScanClient.java
rc/com/android/bluetooth/gatt/ScanManager.java
d8a747e0e92700d336d326ed778c59a1783eded0 20-Jul-2014 Baligh Uddin <baligh@google.com> Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
c862f8526aa4807ea1aa9279b22f8bc80594e4f0 19-Jul-2014 Baligh Uddin <baligh@google.com> Remove deprecated locales - DO NOT MERGE

Change-Id: I1ff0cda5206e98bfeae690e626e6daa01a8e70fc
es/values-az/strings.xml
es/values-az/strings_map.xml
es/values-az/strings_pbap.xml
es/values-az/test_strings.xml
es/values-bn-rWB/strings.xml
es/values-bn-rWB/strings_pbap.xml
es/values-bn-rWB/test_strings.xml
es/values-eu-rPV/strings.xml
es/values-eu-rPV/strings_pbap.xml
es/values-eu-rPV/test_strings.xml
es/values-gl-rGA/strings.xml
es/values-gl-rGA/strings_pbap.xml
es/values-gl-rGA/test_strings.xml
es/values-kn-rKA/strings.xml
es/values-kn-rKA/strings_pbap.xml
es/values-kn-rKA/test_strings.xml
es/values-ml-rKL/strings.xml
es/values-ml-rKL/strings_pbap.xml
es/values-ml-rKL/test_strings.xml
es/values-mr-rMH/strings.xml
es/values-mr-rMH/strings_pbap.xml
es/values-mr-rMH/test_strings.xml
es/values-ne/strings.xml
es/values-ne/strings_map.xml
es/values-ne/strings_pbap.xml
es/values-ne/test_strings.xml
es/values-rm/strings.xml
es/values-rm/strings_pbap.xml
es/values-rm/test_strings.xml
es/values-si/strings.xml
es/values-si/strings_map.xml
es/values-si/strings_pbap.xml
es/values-si/test_strings.xml
es/values-ta-rTN/strings.xml
es/values-ta-rTN/strings_pbap.xml
es/values-ta-rTN/test_strings.xml
es/values-te-rAP/strings.xml
es/values-te-rAP/strings_pbap.xml
es/values-te-rAP/test_strings.xml
f206ddd8115bdcb66ecee0c6feac35b3dc8d4da2 19-Jul-2014 Wei Wang <weiwa@google.com> Fix build

Change-Id: I0e4f8ffec53f606c75dbfae0db50da51118d8ddf
rc/com/android/bluetooth/gatt/AdvertiseManager.java
cdc69a341eae90f177ced91931bc744ee0d34c9d 17-Jul-2014 Wei Wang <weiwa@google.com> More API modification of BLE APIs (2/2)

Change-Id: I65085fa0fa5d02a9163f66555a1c7ba339b454af
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
e5c53efe65fa326e6ce2a7b022a599461a42653e 19-Jul-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into lmp-dev
f436e3aa836f82210968164c4c782adb338212bb 18-Jul-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I4ddc5cb811f31657b93b2eb5cf59dca80fef8a7a
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
es/values-my-rMM/test_strings.xml
es/values-ta-rIN/strings.xml
es/values-ta-rIN/strings_pbap.xml
es/values-ta-rIN/test_strings.xml
cfda60b6b204f6e97bc961d1ac43ef7c43ac26a8 19-Jul-2014 Andre Eisenbach <eisenbach@google.com> Merge "Reduce GATT logging output" into lmp-dev
cae2bfe10d59a759596136a4ff07750fe6176351 18-Jul-2014 Andre Eisenbach <eisenbach@google.com> Reduce GATT logging output

Change-Id: I85e9191065083f11056de44202a8e5a0cba1d2c8
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceConfig.java
fbe63484114cf9b7a79043e0bc5bb74504cf5730 17-Jul-2014 Andre Eisenbach <eisenbach@google.com> LE: Add connection parameter update request API (3/4)

Change-Id: I1be7d530d4db27473086ee8734cdb6aa5e63667c
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
87dfc410a3bc99ddf1dd30114500d2a7970075c0 18-Jul-2014 Wei Wang <weiwa@google.com> Merge "Add an AdvertiseManager for LE advertise operations." into lmp-dev
27bd5f277ccf471f2fa9cd9151a2a226b51bc825 16-Jul-2014 Wei Wang <weiwa@google.com> Add an AdvertiseManager for LE advertise operations.

Move all advertise logic out of GattServiceStateMachine.

Change-Id: I9bc9be29372e79e863fc6a0b16d4808918bfb404
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/Utils.java
rc/com/android/bluetooth/gatt/AdvertiseClient.java
rc/com/android/bluetooth/gatt/AdvertiseManager.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
c78e0ceff0512d8c6365091ae78fd2577df0a75a 17-Jul-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I5e187a6ee17814be70ed1724219ec7a738a8c9d2
Auto-generated-cl: translation import
es/values-sw/strings.xml
es/values-th/test_strings.xml
411ad52f79b7390a5831e30d3e3742c129c6bb6a 14-Jul-2014 Sharvil Nanavati <sharvil@google.com> Fix bug b/16119342 by synchronizing the access of mWakeLock in release().

Change-Id: Ie0fb5d2c5805f854a886729f539adf2ae865bc17
rc/com/android/bluetooth/btservice/AdapterService.java
55a038663154f47fb899d4e8576ed0c440ad6335 15-Jul-2014 Wei Wang <weiwa@google.com> Add ALLOW_ALL filter logic to scan filters. Note filter index 1 is
reserved for ALLOW_ALL filter now.

Change-Id: Ie8b2f94a0112f95bc88323a8319f94fb780790a2
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
2626af8b78e7f42e5e0807d58ca14a4b8f6161b5 11-Jul-2014 Wei Wang <weiwa@google.com> Remove MR2 BLE Advertising hidden API from L codebase (2/2)

Change-Id: I1430cef859544fc97b7c39ead42dcb184707aa5f
rc/com/android/bluetooth/gatt/GattService.java
5b4e66228f799c1187c28be59843e70974243e16 12-Jul-2014 Matthew Xie <mattx@google.com> am 24b52ce7: Merge "Revert "Bluetooth: MAP: Do not set body header if maxlist count is 0"" into klp-wireless-dev

* commit '24b52ce786d8c5fa4bf1c4294ec9fbfd3738754f':
Revert "Bluetooth: MAP: Do not set body header if maxlist count is 0"
878cb162c0d823d6bb4e64f6d5da3770df3fb526 12-Jul-2014 Matthew Xie <mattx@google.com> am c73bd48e: Merge "Bluetooth: MAP: Do not set body header if maxlist count is 0" into klp-wireless-dev

* commit 'c73bd48e5351a12103cb58a15fa9fc33825c9b07':
Bluetooth: MAP: Do not set body header if maxlist count is 0
44499c6ba795ab59ad6387fa00e20537b3c5064e 12-Jul-2014 Matthew Xie <mattx@google.com> am 5693ce1f: Merge "Bluetooth-OPP: Avoid IndexOutOfBoundsException if share is zero" into klp-wireless-dev

* commit '5693ce1fb60f7ebf858b4e35750a9335ebe47c72':
Bluetooth-OPP: Avoid IndexOutOfBoundsException if share is zero
7542c9693eb3e2b645d7594597e1d11163f0b3d4 12-Jul-2014 Matthew Xie <mattx@google.com> am ead7ebb5: Merge "Bluetooth: Fix to avoid crash while sending deleted file" into klp-wireless-dev

* commit 'ead7ebb5ccb5bf81435437b4210a6e5413eb1c2f':
Bluetooth: Fix to avoid crash while sending deleted file
361e580eb6c07759cdd775ed57902839ff4bfe90 11-Jul-2014 Andre Eisenbach <eisenbach@google.com> Unhide Bluetooth batch APIs. Deprecate BluetoothAdpater scan APIs. (2/2)

Change-Id: If29034da523a4f2a0ce9807226363f038f0360cd
rc/com/android/bluetooth/gatt/AdvertiseClient.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
rc/com/android/bluetooth/gatt/ScanFilterQueue.java
c73bd48e5351a12103cb58a15fa9fc33825c9b07 12-Jul-2014 Matthew Xie <mattx@google.com> Merge "Bluetooth: MAP: Do not set body header if maxlist count is 0" into klp-wireless-dev
7f25f97c92b970ef5d58b36f963e7233efd5bf2a 18-Dec-2013 Pradeep Panigrahi <pradeepp@codeaurora.org> Bluetooth: MAP: Do not set body header if maxlist count is 0

As per MAP profile spec when message listing or folder
listing is done with 0 as max list count, then the response
should not contain the body header. Hence add change for the
same

Change-Id: I09b44a07bb9d15f248c0657563da4927ce4b4996
rc/com/android/bluetooth/map/BluetoothMapObexServer.java
24b52ce786d8c5fa4bf1c4294ec9fbfd3738754f 12-Jul-2014 Matthew Xie <mattx@google.com> Merge "Revert "Bluetooth: MAP: Do not set body header if maxlist count is 0"" into klp-wireless-dev
dca114675305d931596e07bcf962aaa3c7515656 12-Jul-2014 Matthew Xie <mattx@google.com> Revert "Bluetooth: MAP: Do not set body header if maxlist count is 0"

This reverts commit 7f25f97c92b970ef5d58b36f963e7233efd5bf2a.

Change-Id: Ib07fd8439f07de8e6028e88eb0a9798c1aec61a0
rc/com/android/bluetooth/map/BluetoothMapObexServer.java
5693ce1fb60f7ebf858b4e35750a9335ebe47c72 10-Jul-2014 Matthew Xie <mattx@google.com> Merge "Bluetooth-OPP: Avoid IndexOutOfBoundsException if share is zero" into klp-wireless-dev
ead7ebb5ccb5bf81435437b4210a6e5413eb1c2f 10-Jul-2014 Matthew Xie <mattx@google.com> Merge "Bluetooth: Fix to avoid crash while sending deleted file" into klp-wireless-dev
bfdb249682283b377ef3fcc3677c4cd2b9154b35 06-Jun-2014 Nitin Shivpure <nshivpur@codeaurora.org> Bluetooth: Fix to avoid crash while sending deleted file

A case where DUT send a file "A" to remote device from
download app(which was already deleted it in file explorer app)
via bluetooth, file sharing is unsuccessful. Now slide down the
status bar, Press bluetooth share item, enter to outbound
transfers screen & Press the "Try again" for file "A" on
file transfer pop-up box. Bluetooth share application is crashed
due to security exception, because it does not have following
permission android.permission.MANAGE_DOCUMENTS. So Adding
android.permission.MANAGE_DOCUMENTS permission to solve this
issue.

Change-Id: I1fea7c359edabf0e653a6afbd8fc864cd65c9663
ndroidManifest.xml
183b33edc8af0344f7651823fa2e622955d15005 10-Jul-2014 Wei Wang <weiwa@google.com> Fix filter index stack initialization issue caused by GattServiceStateMachine created before adapter property is filled.

Change-Id: I4f487378b332d3b33c8646fd78d9ccec41431975
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
8e8d9314d67618e5604059d3758c2c8a92ae361f 09-Jul-2014 Prerepa Viswanadham <dham@google.com> OnFound and Onlost found integration

Change-Id: Ia7bdcd180a318844ab390e23a1f61168e79c324b
rc/com/android/bluetooth/gatt/GattService.java
750fd64e9e3724902190f74ebb2538a966a3e11e 04-Mar-2014 Juffin Alex Varghese <jalex@codeaurora.org> Bluetooth-OPP: Avoid IndexOutOfBoundsException if share is zero

This change will avoid IndexOutOfBoundsException if number of sharing
files are zero. Otherwise, Bluetooth application will force close itself
when exception encountered.

Change-Id: I42473c8ca2d9116c6d57707ab8f3c452d7027e67
rc/com/android/bluetooth/opp/BluetoothOppService.java
f56c48057e5a9b1eae12068ab01d1e6fbb4c9e5d 09-Jul-2014 Wei Wang <weiwa@google.com> Fix a bug that swapped LOW_POWER AND LOW_LATENCY for advertising.

Change-Id: I21c95ef69c6f54f9d60395a9427d30b875e8e261
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
bd061cd6801b84f4248f9cf32dbd294537495f7e 09-Jul-2014 Matthew Xie <mattx@google.com> Merge "resolved conflicts for merge of dc497463 to master"
9b05359927c9687bb601a2ac340be87c8a077342 09-Jul-2014 Matthew Xie <mattx@google.com> resolved conflicts for merge of dc497463 to master

Change-Id: I7bb1b91da3ae3b6e7e21b34a0cdfb5ed417135bc
e3ee0a6264913deb28c160f5c32cb3367e97ee45 09-Jul-2014 Ang Li <angli@google.com> Make ACTION_CONNECTION_ACCESS_REQUEST to be sent in ordered fashion.

The purpose of this change is to enable automated testing
to confirm incoming connection without involving human.
Remove .setClass so the intent is no longer only sent to Settings.
This is ok because the intent is still hidden and protected.
Remove unused imports.

Change-Id: I3be5df4ab440b299a75ec41d566f9eecb0ab3f31
rc/com/android/bluetooth/map/BluetoothMapService.java
dc497463ba2ab84a408faca6d7a9fd0013739d42 08-Jul-2014 Matthew Xie <mattx@google.com> am 7efa9db2: Merge "HFP: Fix missing OK for AT+CLCC in virtual call"

* commit '7efa9db2129c99475684a2e44c4fb89cce3134bc':
HFP: Fix missing OK for AT+CLCC in virtual call
cd9fbb2852d8eba5a97c5d4b924db7276c406715 07-Jul-2014 Dmitry Grinberg <dmitrygr@google.com> am ddfaa805: DO NOT MERGE: Fix concurrency issues with wakelock support

* commit 'ddfaa805da01f2d543430c6ed15ce02a3f9d0160':
DO NOT MERGE: Fix concurrency issues with wakelock support
ddfaa805da01f2d543430c6ed15ce02a3f9d0160 14-Jun-2014 Dmitry Grinberg <dmitrygr@google.com> DO NOT MERGE: Fix concurrency issues with wakelock support

Bluedroid seems to have paths through it that lead us to here in many
ways. Add a lock to prevent confusing ourselves.

Bug: 15532889
Change-Id: Idaa828d9c49fbca5d52bfeeb6e6109df20170e0b
ni/com_android_bluetooth_btservice_AdapterService.cpp
7efa9db2129c99475684a2e44c4fb89cce3134bc 08-Jul-2014 Matthew Xie <mattx@google.com> Merge "HFP: Fix missing OK for AT+CLCC in virtual call"
60bd3f42ecf248b158f3add7a29557e79a40ff86 06-Jul-2014 Baligh Uddin <baligh@google.com> am 58adcf54: (-s ours) am 13ca31dc: (-s ours) am d18a7b47: (-s ours) Import translations. DO NOT MERGE

* commit '58adcf540f82e85e88248a3af71bc8cdf5a86efb':
Import translations. DO NOT MERGE
58adcf540f82e85e88248a3af71bc8cdf5a86efb 06-Jul-2014 Baligh Uddin <baligh@google.com> am 13ca31dc: (-s ours) am d18a7b47: (-s ours) Import translations. DO NOT MERGE

* commit '13ca31dcf258d139fc514ee5b55194495d352b0d':
Import translations. DO NOT MERGE
13ca31dcf258d139fc514ee5b55194495d352b0d 06-Jul-2014 Baligh Uddin <baligh@google.com> am d18a7b47: (-s ours) Import translations. DO NOT MERGE

* commit 'd18a7b47b99f233f1e381879396c9cfd6395ee4a':
Import translations. DO NOT MERGE
d18a7b47b99f233f1e381879396c9cfd6395ee4a 05-Jul-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I58cd4eda734be2858f20e090393cde2721db79da
Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-iw/strings.xml
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
es/values-th/strings.xml
es/values-th/test_strings.xml
544c8f08dfdef31604ec21318b08ebe8d5b98e92 08-Jul-2014 Nick Kralevich <nnk@google.com> Merge "Fix "Clone" call"
20e28abb314da5a052ee8cebd07308f1c3cab674 08-Jul-2014 Wei Wang <weiwa@google.com> Merge "Implementation of batch scan."
e84b9ab8ebca5e6d108d722fa84234fddf3685cd 02-Jul-2014 Wei Wang <weiwa@google.com> Implementation of batch scan.

Change-Id: I247a1676d20131ca05674da44a06d8c21785d71d
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
2ca3505536cd31a3e169a5f67f146897c80af353 08-Jul-2014 Ye Wen <ywen@google.com> Remove dependency on deprecated mms-common module

Change-Id: I9e655e305651d2eca123fa0ee79678488e00fd13
ndroid.mk
beccdc6d1647c56c91ddfd14f7990371168fb870 03-Jul-2014 Sharvil Nanavati <sharvil@google.com> Specify a thead name when attaching a bluedroid thread to ART.

Change-Id: I0c9804d7ed1ff64cb155902f91bc5b52e981458c
ni/com_android_bluetooth_btservice_AdapterService.cpp
82fd8ab0ea31cae99487006a7359a54460b87fa2 07-Jul-2014 Dmitry Grinberg <dmitrygr@google.com> am cd9fbb28: (-s ours) am ddfaa805: DO NOT MERGE: Fix concurrency issues with wakelock support

* commit 'cd9fbb2852d8eba5a97c5d4b924db7276c406715':
DO NOT MERGE: Fix concurrency issues with wakelock support
9d8fda5898597cb632994d3b9b0d3c64ded572f9 06-Jul-2014 Baligh Uddin <baligh@google.com> am 60bd3f42: (-s ours) am 58adcf54: (-s ours) am 13ca31dc: (-s ours) am d18a7b47: (-s ours) Import translations. DO NOT MERGE

* commit '60bd3f42ecf248b158f3add7a29557e79a40ff86':
Import translations. DO NOT MERGE
3a91ac3eefe23a22aa0abc1a89ac253a2b0dbae9 05-Jul-2014 Nick Kralevich <nnk@google.com> Fix "Clone" call

The function name is "clone", not "Clone".

Also, add @Override so errors like this can be detected at
compile time.

Change-Id: Iaf5ec35cdfcd49dec786f14a72c1ebe42aa6bf05
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/JniCallbacks.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
a99506abbe64f5f9c92d5477add798cb2a876fc2 05-Jul-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I6af30c799e7a89afa6b004b9ca98dc3580b765e3
Auto-generated-cl: translation import
es/values-bn-rBD/strings.xml
es/values-bn-rBD/strings_pbap.xml
es/values-bn-rBD/test_strings.xml
es/values-eu-rES/strings.xml
es/values-eu-rES/strings_pbap.xml
es/values-eu-rES/test_strings.xml
es/values-gl-rES/strings.xml
es/values-gl-rES/strings_pbap.xml
es/values-gl-rES/test_strings.xml
es/values-kn-rIN/strings.xml
es/values-kn-rIN/strings_pbap.xml
es/values-kn-rIN/test_strings.xml
es/values-ml-rIN/strings.xml
es/values-ml-rIN/strings_pbap.xml
es/values-ml-rIN/test_strings.xml
es/values-mr-rIN/strings.xml
es/values-mr-rIN/strings_pbap.xml
es/values-mr-rIN/test_strings.xml
es/values-ta-rIN/strings.xml
es/values-ta-rIN/strings_pbap.xml
es/values-ta-rIN/test_strings.xml
es/values-te-rIN/strings.xml
es/values-te-rIN/strings_pbap.xml
es/values-te-rIN/test_strings.xml
es/values-th/test_strings.xml
c4b937588bb1a0b73071bbaa120906f5ff501059 02-Jul-2014 Prerepa Viswanadham <dham@google.com> am 40422f10: Obtain capabilities from BLE chipset for it\'s support of various features

* commit '40422f101e8ea8c852173a63d4faa1f01dcfa150':
Obtain capabilities from BLE chipset for it's support of various features
40422f101e8ea8c852173a63d4faa1f01dcfa150 02-Jul-2014 Prerepa Viswanadham <dham@google.com> Obtain capabilities from BLE chipset for it's support of various features

Change-Id: I594790bd837a22488c1e080e340cb1c66ed4367b
rc/com/android/bluetooth/btservice/AdapterService.java
701d60eb4c53dafc4290ecaba13f719a945e38da 01-Jul-2014 Julia Reynolds <juliacr@google.com> Restrict bluetooth tethering with user restrictions.

Bug: 15852213
Change-Id: I641b03c3e5fa4018b382f5ed835218f4196ef7f7
rc/com/android/bluetooth/pan/PanService.java
6c8fe1c0a28997fae737fa13ff48f4c62d83bcbb 01-Jul-2014 Baligh Uddin <baligh@google.com> am 5eff2b04: (-s ours) am f718b924: (-s ours) Import translations. DO NOT MERGE

* commit '5eff2b04d8a0a98b77029d543f1c23070b2a0e69':
Import translations. DO NOT MERGE
5eff2b04d8a0a98b77029d543f1c23070b2a0e69 01-Jul-2014 Baligh Uddin <baligh@google.com> am f718b924: (-s ours) Import translations. DO NOT MERGE

* commit 'f718b924d87a42fb159c8c4ebbfc11dd7d8a9941':
Import translations. DO NOT MERGE
2c0df0560ad5ae3fd6022b17b17a6a70143e216a 16-Aug-2013 Hemant Gupta <hemantg@codeaurora.org> Bluetooth: Support MAP Client role on Bluedroid.

Implementation changes to support Message Access Profile
client role in Bluetooth Apk.

Change-Id: I209909a2b18e43c7931571526b983453795f6c6b
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/JniCallbacks.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
f718b924d87a42fb159c8c4ebbfc11dd7d8a9941 01-Jul-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I06306963deb2a8a064bbff1662bcb7bdd7fe9d82
Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
es/values-th/test_strings.xml
ee7ff974b660d954ca2f188e54072d410f2b9c2f 01-Jul-2014 Wei Wang <weiwa@google.com> am f66efab4: fix build error on kwd

* commit 'f66efab444805947fd67c5ce1f8f0a592260fcf5':
fix build error on kwd
f66efab444805947fd67c5ce1f8f0a592260fcf5 01-Jul-2014 Wei Wang <weiwa@google.com> fix build error on kwd

Change-Id: I29debb4ea6a1bb33e2a5e182b86c066179f8ac92
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
1c49c64e9acd821291918da343ba99ac585d00e2 01-Jul-2014 Wei Wang <weiwa@google.com> am a61c69cd: Phase 2 scan filter implementation. Also provides skeleton for batching and onFound/onLost integration.

* commit 'a61c69cd9e1fb148f56f16b1b768bed427b3b51d':
Phase 2 scan filter implementation. Also provides skeleton for batching and onFound/onLost integration.
a61c69cd9e1fb148f56f16b1b768bed427b3b51d 28-Jun-2014 Wei Wang <weiwa@google.com> Phase 2 scan filter implementation. Also provides skeleton for batching and onFound/onLost integration.

DO NOT MERGE : Cherrypick from master to kwd.

Change-Id: I2e838296191ff6f55481fcde7d05d7cd6d4899dc
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
rc/com/android/bluetooth/gatt/ScanFilterQueue.java
ee8ad19e379e97582b58e3c9f87d587bae7e6ce3 01-Jul-2014 Todd Poynor <toddpoynor@google.com> Merge "Change some rule in Pbap to fix Test case issues"
dcec9008751b6c8865ad32dc338d5fee82d9db58 01-Jul-2014 Matthew Xie <mattx@google.com> am ecb463f9: Merge "[BT] Fix bug: MAP client can not get MessageListing for draft folder" into klp-wireless-dev

* commit 'ecb463f9e1974fa5980a69f1370275972107143f':
[BT] Fix bug: MAP client can not get MessageListing for draft folder
628b72197e389446ec59dc1219a0f2e11c202ae3 01-Jul-2014 Matthew Xie <mattx@google.com> am bf765c09: change bt_headset_wbs to bt_wbs

* commit 'bf765c090de4b973f4eede4f4248f5e422454c2d':
change bt_headset_wbs to bt_wbs
bf765c090de4b973f4eede4f4248f5e422454c2d 21-May-2014 Matthew Xie <mattx@google.com> change bt_headset_wbs to bt_wbs

Change-Id: I8942b29231e4df024bbf3b174abd83e8b5876c96
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
76dc9e2d09ea7f2655e557462c149a0c6b6dd771 20-Jun-2014 Mick Lin <Mick.Lin@mediatek.com> Change some rule in Pbap to fix Test case issues

Change-Id: Iec6db0c52cf05fd6fada40b7726b02768474181a
(cherry picked from commit e529b58896b2191eacbc6aa0f01f1f0341626d21)
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
76301c48d4f5edc78cc5c6b9d66f006052c97c6e 01-Jul-2014 Matthew Xie <mattx@google.com> am b6132733: Add WBS support on Bluedroid (5/6)

* commit 'b6132733b6e386cc8c93b5598c72ed8efe04bf3e':
Add WBS support on Bluedroid (5/6)
b6132733b6e386cc8c93b5598c72ed8efe04bf3e 28-Apr-2014 Matthew Xie <mattx@google.com> Add WBS support on Bluedroid (5/6)

Bug 13764086

Change-Id: Ib6c5d5f4321006ce1a35045907618abc417e6352
ni/com_android_bluetooth_hfp.cpp
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
ecb463f9e1974fa5980a69f1370275972107143f 01-Jul-2014 Matthew Xie <mattx@google.com> Merge "[BT] Fix bug: MAP client can not get MessageListing for draft folder" into klp-wireless-dev
f2919fe3409cb17a062baa74361d2129d90ece2b 01-Jul-2014 Wei Wang <weiwa@google.com> Fix build error.

Change-Id: Ic0fe44304477e9ba488bab141804e1e1a3db675d
ni/com_android_bluetooth_gatt.cpp
a308d4fcdb58a61afb18ad590800193a195db3ee 30-Jun-2014 Wei Wang <weiwa@google.com> Merge "Phase 2 scan filter implementation. Also provides skeleton for batching and onFound/onLost integration."
2b670d217c743a7a8082f1d72baf532ef66ba21c 28-Jun-2014 Wei Wang <weiwa@google.com> Phase 2 scan filter implementation. Also provides skeleton for batching and onFound/onLost integration.

Change-Id: I2e838296191ff6f55481fcde7d05d7cd6d4899dc
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
rc/com/android/bluetooth/gatt/ScanFilterQueue.java
0df7487fd9903f8e49e51b28fac548f26f2a562c 30-Jun-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I4bb8350e2c624b77730c475d3b20139d9231a841
Auto-generated-cl: translation import
es/values-bn-rWB/strings.xml
es/values-bn-rWB/strings_pbap.xml
es/values-bn-rWB/test_strings.xml
es/values-eu-rPV/strings.xml
es/values-eu-rPV/strings_pbap.xml
es/values-eu-rPV/test_strings.xml
es/values-gl-rGA/strings.xml
es/values-gl-rGA/strings_pbap.xml
es/values-gl-rGA/test_strings.xml
es/values-is-rIS/strings.xml
es/values-is-rIS/strings_pbap.xml
es/values-is-rIS/test_strings.xml
es/values-kk-rKZ/strings.xml
es/values-kk-rKZ/strings_pbap.xml
es/values-kk-rKZ/test_strings.xml
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
es/values-kn-rKA/strings.xml
es/values-kn-rKA/strings_pbap.xml
es/values-kn-rKA/test_strings.xml
es/values-ky-rKG/strings.xml
es/values-ky-rKG/strings_pbap.xml
es/values-ky-rKG/test_strings.xml
es/values-mk-rMK/strings.xml
es/values-mk-rMK/strings_pbap.xml
es/values-mk-rMK/test_strings.xml
es/values-ml-rKL/strings.xml
es/values-ml-rKL/strings_pbap.xml
es/values-ml-rKL/test_strings.xml
es/values-mr-rMH/strings.xml
es/values-mr-rMH/strings_pbap.xml
es/values-mr-rMH/test_strings.xml
es/values-my-rMM/strings.xml
es/values-my-rMM/strings_pbap.xml
es/values-my-rMM/test_strings.xml
es/values-ne-rNP/strings.xml
es/values-si-rLK/strings.xml
es/values-ta-rTN/strings.xml
es/values-ta-rTN/strings_pbap.xml
es/values-ta-rTN/test_strings.xml
es/values-te-rAP/strings.xml
es/values-te-rAP/strings_pbap.xml
es/values-te-rAP/test_strings.xml
es/values-ur-rPK/strings.xml
es/values-ur-rPK/strings_pbap.xml
es/values-ur-rPK/test_strings.xml
es/values-uz-rUZ/strings.xml
es/values-uz-rUZ/strings_pbap.xml
es/values-uz-rUZ/test_strings.xml
74b2317d360f302c2cdd36e00b4b8e1a9d0674a4 29-Jun-2014 Hemant Gupta <hemantg@codeaurora.org> am 43b941ed: MAP: Remove pending MAP authorization pop up

* commit '43b941ed67f10876a3d730cc095ddb6589e9c1b6':
MAP: Remove pending MAP authorization pop up
b45cd4213217329ee1efb4499cccf0f38a293775 29-Jun-2014 Hemant Gupta <hemantg@codeaurora.org> am 5079ae05: MAP: Modify XML serializer to escape double quote

* commit '5079ae05a3fa7cf09d2d8e564b71382dfc70a1ae':
MAP: Modify XML serializer to escape double quote
75fdd3e0888d37e8f1b4997fd688e0da12b4bbbe 29-Jun-2014 Hemant Gupta <hemantg@codeaurora.org> am 5c397073: MAP: Return OBEX_HTTP_NOT_IMPLEMENTED response code for msgUpdate

* commit '5c3970730dee1da5d1f37bc03a595dc1e9c47152':
MAP: Return OBEX_HTTP_NOT_IMPLEMENTED response code for msgUpdate
27a4001f202fd55c8864216db9b7afe113d13b0d 29-Jun-2014 Hemant Gupta <hemantg@codeaurora.org> am c1f597b3: MAP: Set messageList element to proper size based on offset/count

* commit 'c1f597b3ec02ccc112f3c917fd079588034c3eac':
MAP: Set messageList element to proper size based on offset/count
ff0887813a704d9b1cca118499b8ed0a68682ef1 29-Jun-2014 Hemant Gupta <hemantg@codeaurora.org> am 0e7e1496: MAP: Fix MNS observer sync and sendevent exception issue.

* commit '0e7e149687b0b5e340991b20c9d8e5232e8d3e39':
MAP: Fix MNS observer sync and sendevent exception issue.
5dab95cba01eeea272f9e9e96faf3b11f84a4ad9 29-Jun-2014 Hemant Gupta <hemantg@codeaurora.org> am 400eaf87: MAP: Fix fatal exception due to missing looper for current thread

* commit '400eaf8761223196a18b84247b066f0201226c3b':
MAP: Fix fatal exception due to missing looper for current thread
d600b53f526a6fcb54ca8f7e347aafa72f9d3f4e 29-Jun-2014 Hemant Gupta <hemantg@codeaurora.org> am 6db8e703: PBAP: Add Filters support.

* commit '6db8e703719f301f75acdf4acacc3296cc1b5016':
PBAP: Add Filters support.
7de8acd090770cfd5d94b299b4f9c40f8970dcda 29-Jun-2014 Hemant Gupta <hemantg@codeaurora.org> am 29ab94a0: PBAP: Strip unwanted braces and spaces from telephone number.

* commit '29ab94a024ffce08229f1c2c6776d1e72d2a3f75':
PBAP: Strip unwanted braces and spaces from telephone number.
c76fe0ddf8dc1c469e17b3ca12127295f0d42371 29-Jun-2014 Hemant Gupta <hemantg@codeaurora.org> am 4216387d: PBAP: Remove the PBAP pop up in various scenarios

* commit '4216387d9887926cebd652f8d3807d780642fc87':
PBAP: Remove the PBAP pop up in various scenarios
43b941ed67f10876a3d730cc095ddb6589e9c1b6 26-Nov-2013 Hemant Gupta <hemantg@codeaurora.org> MAP: Remove pending MAP authorization pop up

- If USER turn off BT on DUT before accepting incoming
authorization request for MAP connection, then MAP
authorization pop up should be removed. Thsi was failing
as user time-out scenario was not handled currently,
where MAP OBEX session is stopped. So MAP OBEX session will
not get cleared till BT OFF. So MAP OBEX connection was failing
from next iteration onward. Queuing User time-out(30 seconds)
to disconnect MAP OBEX session to solve this issue.

-If ACL is disconnected by remote device before accepting
incoming authorization request for MAP connection, then MAP
authorization pop up should be removed.

Change-Id: Ib8068f793eb1b55a155d3ff657efefc40728233c
rc/com/android/bluetooth/map/BluetoothMapService.java
5079ae05a3fa7cf09d2d8e564b71382dfc70a1ae 30-Jan-2014 Hemant Gupta <hemantg@codeaurora.org> MAP: Modify XML serializer to escape double quote

Modify code to use FastXmlSerializer instead of XmlSerializer
to escape double quote character with &quot; and always enclose
XML attribute value within double quotes

Change-Id: I097e6d6de2e4cd44579a6d07842d0cffe26c0139
rc/com/android/bluetooth/map/BluetoothMapMessageListing.java
rc/com/android/bluetooth/map/BluetoothMapMessageListingElement.java
5c3970730dee1da5d1f37bc03a595dc1e9c47152 04-Dec-2013 Hemant Gupta <hemantg@codeaurora.org> MAP: Return OBEX_HTTP_NOT_IMPLEMENTED response code for msgUpdate

In MAP profile message update is not implemented for sms/mms, but
we are returning OBEX_HTTP_OK response code for message update put
request, which is causing PTS test case to fail. Hence returning
proper response code to pass pts.

Change-Id: I40a45cea2d85750583bb7ae205d1ff57fe806a4d
rc/com/android/bluetooth/map/BluetoothMapObexServer.java
c1f597b3ec02ccc112f3c917fd079588034c3eac 02-Jan-2014 Hemant Gupta <hemantg@codeaurora.org> MAP: Set messageList element to proper size based on offset/count

Handle all the cases based on offset and count to create message list
element when message listing is performed from car kit for any folder

Change-Id: Ibcc6f8ed24c47464e05f26a79b38b99d233ca58b
rc/com/android/bluetooth/map/BluetoothMapMessageListing.java
0e7e149687b0b5e340991b20c9d8e5232e8d3e39 08-Nov-2013 Hemant Gupta <hemantg@codeaurora.org> MAP: Fix MNS observer sync and sendevent exception issue.

Allow MNS Client sendEvent only when MNS Client is registered
and connected to fix NullPointer exceptions. Mark MNS disconnect
and observer registration as synchronized to handle synchronization
for operations from worker and main threads.

Change-Id: If34a6b67a1774f693ed42cfb6c871cd9563abe55
rc/com/android/bluetooth/map/BluetoothMapContentObserver.java
rc/com/android/bluetooth/map/BluetoothMnsObexClient.java
400eaf8761223196a18b84247b066f0201226c3b 23-Oct-2013 Hemant Gupta <hemantg@codeaurora.org> MAP: Fix fatal exception due to missing looper for current thread

While creating handler for the thread, there was fatal exception getting
thrown because the present thread does not have a looper. So passing the
applications looper to be used , while creating the handler to avoid this
exception.

Change-Id: Id8c121439d7a93af7592a15df67523e96a1312ff
rc/com/android/bluetooth/map/BluetoothMapContentObserver.java
6db8e703719f301f75acdf4acacc3296cc1b5016 13-May-2013 Hemant Gupta <hemantg@codeaurora.org> PBAP: Add Filters support.

This patch adds attribute filter support to PBAP. It will allow remote
devices to request the particular attributes.

Change-Id: Ia0a4f55f14925b0cf8d0553c64222d781edef2fd
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
29ab94a024ffce08229f1c2c6776d1e72d2a3f75 29-Aug-2013 Hemant Gupta <hemantg@codeaurora.org> PBAP: Strip unwanted braces and spaces from telephone number.

This patch removes unwanted spaces and braces from the telephone
number on vcard entry formation. Handsfree call was failing because
of these characters due to handling of only digits in utl_isdialstr
API in BD stack (external/bluetooth/bluedroid/bta/ag/bta_ag_cmd.c)

Change-Id: I2d63967059a9cb97f214b370fac17234f6e58f55
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
4216387d9887926cebd652f8d3807d780642fc87 07-May-2014 Hemant Gupta <hemantg@codeaurora.org> PBAP: Remove the PBAP pop up in various scenarios

-If ACL is disconnected by remote device OR DUT(unbond from
the DUT) before accepting incoming authorization request for
PBAP connection. PBAP authorization pop up should be removed.

- If authorization is cancelled due to USER_TIMEOUT(30 second),
then PBAP authorization pop up should be removed.

Change-Id: I0a69f23c7882a43de9fe207c84926de91713c79b
ndroidManifest.xml
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
faec4b404f63184cddffd557a2d38d6a85459d94 29-Jun-2014 Matthew Xie <mattx@google.com> am 8f5a4787: Merge "PBAP: Check for spurious entries of searched contacts" into klp-wireless-dev

* commit '8f5a4787761ebdaa852c0b5d7c7b89c339e140b8':
PBAP: Check for spurious entries of searched contacts
d00ddaf33ab17eee6c9009048064cac8541a90b6 28-Jun-2014 Andre Eisenbach <eisenbach@google.com> am 1ebce7fb: LE: Add is_connected() function (3/3)

* commit '1ebce7fb88348be7b984b1a778bd1bbeea20d6d7':
LE: Add is_connected() function (3/3)
6e1ec7f9efd167a9c7ea7a0fe9a2cb9ca5c30a34 28-Jun-2014 Andre Eisenbach <eisenbach@google.com> am a03c33b3: (-s ours) Adding a method BluetoothDevice.isConnected()

* commit 'a03c33b370420dc6ad688b217b5a37bfa43169cf':
Adding a method BluetoothDevice.isConnected()
5b33247a53d116bee8c842197c8d680c6326edb5 28-Jun-2014 Andre Eisenbach <eisenbach@google.com> am af471e1d: LE: Add notification sent and congestion callbacks (4/4)

* commit 'af471e1d5765aa9f1b15909ed488c6c9eb57090e':
LE: Add notification sent and congestion callbacks (4/4)
cd1ddf5e5bf069965f0fb1bd11a985a1a4afd629 28-Jun-2014 Ganesh Ganapathi Batta <ganeshg@broadcom.com> am 6fb74b22: Fix issue with converting byte array into unsigned integers

* commit '6fb74b225ec5efc8caef0fec82692e33392b8ecb':
Fix issue with converting byte array into unsigned integers
462f03c517f9e62774ed83f8048f38484372ee82 28-Jun-2014 Mike Lockwood <lockwood@google.com> am b83d7c60: Rename BluetoothHandsfreeClient to BluetoothHeadsetClient

* commit 'b83d7c6016ccd2b95b5e3b08581f5e2b21d68905':
Rename BluetoothHandsfreeClient to BluetoothHeadsetClient
4034a1b5fd7126e6a9769a91b0c4f67c20ac3b01 28-Jun-2014 Mike Lockwood <lockwood@google.com> am b824e262: (-s ours) Move AVRCP Controller support to new BluetoothAvrcpController profile

* commit 'b824e2624524d039b12ce3b7de2747ff558bfe94':
Move AVRCP Controller support to new BluetoothAvrcpController profile
d827b2622e24ae1380ab071bdb3e1a98ee83406b 28-Jun-2014 Mike Lockwood <lockwood@google.com> am 9ebf7624: (-s ours) A2DP Sink: Add support for BluetoothA2dpSink profile

* commit '9ebf7624eb97e76d34ceceebf4ab1558d73df246':
A2DP Sink: Add support for BluetoothA2dpSink profile
8e594637b5f8e6d4c88554b17c42c8d31b5a6fb3 28-Jun-2014 Sharvil Nanavati <sharvil@google.com> am c453f0f5: (-s ours) Expose wake lock / wake alarm functionality to bluedroid.

* commit 'c453f0f533556d8ffbb7a87ca09d6b30e259978e':
Expose wake lock / wake alarm functionality to bluedroid.
d297013c0c9d00684b4f8f64616da66c7dda74d0 28-Jun-2014 Prerepa Viswanadham <dham@google.com> am 32088854: Refactor ScanClient scan settings to one place Scan_mode_low_power 500ms/5000ms (10%) scan_mode_balanced 2000ms/5000ms (40%) scan_mode_low_latency 5000ms/5000ms (100%)

* commit '32088854fd6a8bb5e570a4a1df4eaf2eb19d7ae3':
Refactor ScanClient scan settings to one place Scan_mode_low_power 500ms/5000ms (10%) scan_mode_balanced 2000ms/5000ms (40%) scan_mode_low_latency 5000ms/5000ms (100%)
63d0fadc5259782a3d59c48ae9057ec08e1290d3 28-Jun-2014 Wei Wang <weiwa@google.com> am 0c80f016: Add missing licenses.

* commit '0c80f016af7f313611b0bac77da6e3ee695c0c73':
Add missing licenses.
0d60827280e7b18b08543be2aac1df7b019f8d32 28-Jun-2014 Prerepa Viswanadham <dham@google.com> am cefee9c4: (-s ours) Use controller provided information about it BLE L feature capabilities

* commit 'cefee9c44890a0943a9fd7c2891324fd81d50b28':
Use controller provided information about it BLE L feature capabilities
a9eae5962ec9293088a3ac2f9fbaaca5c6db803f 28-Jun-2014 Ganesh Ganapathi Batta <ganeshg@broadcom.com> am ac464064: (-s ours) Add support for retrieving local LE features via get_adapter_properties

* commit 'ac4640647b4dfae61cc2a8c37d3d798bdc82a553':
Add support for retrieving local LE features via get_adapter_properties
4dc3724b2d1f96ca4be03a219225f524c6d97662 28-Jun-2014 Wei Wang <weiwa@google.com> am c92b13ad: (-s ours) Add device capability config for new BLE features(MA, scan filter).(2/3)

* commit 'c92b13ad9671810e6f10bbfce3032d33765f0a15':
Add device capability config for new BLE features(MA, scan filter).(2/3)
4675349933b33247989ebd04b51cc9a41a3c3808 28-Jun-2014 Wei Wang <weiwa@google.com> am 8426b439: (-s ours) Fix build.

* commit '8426b4392456869935f90bf51be68ce198a86c01':
Fix build.
701d500c53199f24123bf5346cde32197187208f 28-Jun-2014 Prerepa Viswanadham <dham@google.com> am 6e2fce02: (-s ours) Set scan parameters in ScanClient based on BluetoothLeScanSettings configuration

* commit '6e2fce02940bde40a2c8a48a725e9fa0157bde6c':
Set scan parameters in ScanClient based on BluetoothLeScanSettings configuration
3ccb2cbc044c85e075f99ade844b9ca6a4096c10 28-Jun-2014 Wei Wang <weiwa@google.com> am fa13d447: (-s ours) Merge diffs from API review comments(2/2).

* commit 'fa13d4471d52a5780eb4c4efcedff6778060f7fa':
Merge diffs from API review comments(2/2).
391df543ef93a45833159372bfa12c407213cea2 28-Jun-2014 Wei Wang <weiwa@google.com> am f3e3ade7: (-s ours) Add protection for controller timeout/failure, maximum number of advertisers, filters etc.

* commit 'f3e3ade729080636d0a3e9224ee205183fe11fa0':
Add protection for controller timeout/failure, maximum number of advertisers, filters etc.
65003d05caa13f2c34141585f38b1c065a28f208 28-Jun-2014 Mike Lockwood <lockwood@google.com> am 7a02049b: Fix arguments to AudioManager.setBluetoothA2dpDeviceConnectionState()

* commit '7a02049bb3835c66e4b26700b6606b0ca5db7c6e':
Fix arguments to AudioManager.setBluetoothA2dpDeviceConnectionState()
913544430069acbbeb1cd8c94b1c1d49b33be27a 28-Jun-2014 Wei Wang <weiwa@google.com> am 233a9ce2: (-s ours) Changes due to addressing BLE API review comments

* commit '233a9ce2117ae01d2ead214f0629b4aa1ff0ad85':
Changes due to addressing BLE API review comments
1ebce7fb88348be7b984b1a778bd1bbeea20d6d7 18-Jun-2014 Andre Eisenbach <eisenbach@google.com> LE: Add is_connected() function (3/3)

Change-Id: I71f64ff59e4602d2834f1c177310a36320e70ead
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
8f5a4787761ebdaa852c0b5d7c7b89c339e140b8 29-Jun-2014 Matthew Xie <mattx@google.com> Merge "PBAP: Check for spurious entries of searched contacts" into klp-wireless-dev
a03c33b370420dc6ad688b217b5a37bfa43169cf 08-May-2014 Andre Eisenbach <eisenbach@google.com> Adding a method BluetoothDevice.isConnected()

Adding a new method to BluetoothDevice that lets callers know whether a remote device is
connected.

Original-patch-by: Jay Civelli <jcivelli@google.com>
Cherry-picked-from: master
Change-Id: Ia8ad2e3189d08b63832634bdf804656b8d013820
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
af471e1d5765aa9f1b15909ed488c6c9eb57090e 28-Mar-2014 Andre Eisenbach <eisenbach@google.com> LE: Add notification sent and congestion callbacks (4/4)

This change introduces two new callbacks for applications to better
handle LE notification flow control and transport congestion. The
notification callback is invoked when the remote platform confirms an
indication or when a local notification has been passed to the
controller. No new notifications should be sent until a callback is
received.

Congestion callbacks are triggered when a GATT operation cannot be sent
to the local Bluetooth controller. Repeatedly calling
writeCharacteristic() for example will eventually trigger a congestion
callback. Applications cannot send additional data until a further
callback is received, indicating that the congestion has cleared up.

Change-Id: I5feb555b4843bd25b1d40338651695ac082e1386
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
353777c0c85ca040795646e53a29080924a99d1a 28-Jun-2014 Matthew Xie <mattx@google.com> Merge "fix a merge error in PanService"
21492655012d6d3d521b8a49797366b434115bcf 28-Jun-2014 Matthew Xie <mattx@google.com> fix a merge error in PanService

Change-Id: I63734e44ca661166da9091fae622a9e54bd24431
rc/com/android/bluetooth/pan/PanService.java
f28985304db01146a22081c63ce066e4c6ee32c7 28-Jun-2014 Wei Wang <weiwa@google.com> am d379f2dd: (-s ours) only stop ble scan when it\'s already started.

* commit 'd379f2dd23cf0d237c2a251279a1ff0d355f1ed7':
only stop ble scan when it's already started.
82c554b73e7a5819f1d3975900dc606c1a27b17a 28-Jun-2014 Mike Lockwood <lockwood@google.com> am d74ba493: (-s ours) Merge "[4/4] Add Support for AVRCP Controller Feature" into klp-wireless-dev

* commit 'd74ba4930e66087ecfe7e307f1a27e895df31d97':
[4/4] Add Support for AVRCP Controller Feature
683ce5ea19f34fcfd271868ccc36aeebcf2c8765 28-Jun-2014 Wei Wang <weiwa@google.com> am b16d4b64: (-s ours) Add scan response as an advertising parameter(2/2).

* commit 'b16d4b64de7643ba9c28fc62f768463cde1f9420':
Add scan response as an advertising parameter(2/2).
305772c735cc59b63d964fea79274605e883da42 28-Jun-2014 Wei Wang <weiwa@google.com> am 628441e0: (-s ours) Use state machine in gatt service to handle different state transitions. For this CL only normal BLE scans are moved to state machine.

* commit '628441e02c280f8f48adba0ade3c7028cbcdeec2':
Use state machine in gatt service to handle different state transitions. For this CL only normal BLE scans are moved to state machine.
1f27231582eeb479325f844ea4aacf804477d4fa 28-Jun-2014 Mike Lockwood <lockwood@google.com> am 468f9380: Set HFP client profile off by default, enable via resource override rather than system property.

* commit '468f938001cd5dc7912fc8779c00987c44aafab2':
Set HFP client profile off by default, enable via resource override rather than system property.
3683c022d0b912e13f398537c140c8f291a7f9b1 28-Jun-2014 Mike Lockwood <lockwood@google.com> am a4b39a55: (-s ours) Merge "[4/4] Bluetooth: Add support for HFP Client role." into klp-wireless-dev

* commit 'a4b39a558accff559561d60dbdafe9cf457a430b':
[4/4] Bluetooth: Add support for HFP Client role.
306ac12fcaef14f935b2cbec88ad451ec2be77d2 28-Jun-2014 Mike Lockwood <lockwood@google.com> am 790352c7: (-s ours) Merge "Submitted on behalf of 3rd party copied from packages/apps/Bluetooth/" into klp-wireless-dev

* commit '790352c7ff44eec4bb2458bea79c71e5b86c3206':
Submitted on behalf of 3rd party copied from packages/apps/Bluetooth/
58a733190a0004177fee1c73dd829c2a602514a8 28-Jun-2014 Prerepa Viswanadham <dham@google.com> am 63ee0478: (-s ours) Improve name of api.

* commit '63ee04788c7384779eadb10f0c2cd10779ebfb43':
Improve name of api.
a2ab85a366feb5d1da13e30de71d6641ca381a02 28-Jun-2014 Prerepa Viswanadham <dham@google.com> am dd2d4b97: (-s ours) set scan parameters in BT stack. Apply the most demanding request in terms of duty cycle for all outstanding requests.

* commit 'dd2d4b97992bfa4bb549fc5e61b0a7c02acc013a':
set scan parameters in BT stack. Apply the most demanding request in terms of duty cycle for all outstanding requests.
e3d35d274868774cc96d644b76c2a785074f93eb 28-Jun-2014 Prerepa Viswanadham <dham@google.com> am c8e3bda0: (-s ours) LE: Add API to set scan interval and window (3/4)

* commit 'c8e3bda018603f40aabf62e2fb59615b24039634':
LE: Add API to set scan interval and window (3/4)
291695c66d50450388f30b9c83242c62d6370679 28-Jun-2014 Wei Wang <weiwa@google.com> am 39fadfcd: Changes due to the rename of isShortUuid to is16BitUuid.

* commit '39fadfcd92a969a750dafb8e37c468daff9c1054':
Changes due to the rename of isShortUuid to is16BitUuid.
3f9f111b47fb92c1453b564a45703bfe9638282e 28-Jun-2014 Hemant Gupta <hemantg@codeaurora.org> am 0d132248: PBAP: Change string search comparison from NULL to empty

* commit '0d1322483285ccc9ca7bedf515821c5c105a44e6':
PBAP: Change string search comparison from NULL to empty
911d5ab8e5e5cee8d4e97741d3e965da943c2465 28-Jun-2014 Hemant Gupta <hemantg@codeaurora.org> am c592e5a6: PBAP: Fix crash in com.android.bluetooth

* commit 'c592e5a6de0011cd60f23ac18a7bd56d8eeb5dd1':
PBAP: Fix crash in com.android.bluetooth
a1ce8b1c1f4931f2623e6ae357ad897d9eb2b17f 28-Jun-2014 Zhihai Xu <zhihaixu@google.com> am 255407d2: MHF: Disconnect audio for HS1 before disconnecting ACL.

* commit '255407d2c34234150b09e70584adaf72175b0eea':
MHF: Disconnect audio for HS1 before disconnecting ACL.
24e9d5dcebc4f23a9abb70c9891e85debf0da530 28-Jun-2014 Ganesh Ganapathi Batta <ganeshg@broadcom.com> am 4f491cb7: (-s ours) Set profile priorities only after SDP completion

* commit '4f491cb7088f918a10d39b52729233d3c98483f2':
Set profile priorities only after SDP completion
48bd916669af6d23315487f4e8d08a2b269a71f1 28-Jun-2014 Hemant Gupta <hemantg@codeaurora.org> am ebc7d6d8: Bluetooth-OPP: Handle HID mouse right click event

* commit 'ebc7d6d8ff2512a1e8bc799f887716d88b671e85':
Bluetooth-OPP: Handle HID mouse right click event
e0fb8f470794af995adbb724873f8d4110095983 28-Jun-2014 Ganesh Ganapathi Batta <ganeshg@broadcom.com> am d93e1487: (-s ours) Add transport param to Connect APIs

* commit 'd93e1487863468898b752d54b07dcd4e0661c113':
Add transport param to Connect APIs
a5c0dbfb4fd85ff2012b3364411a3cadce9f8d61 28-Jun-2014 Sunny Kapdi <sunnyk@codeaurora.org> am 5d56b57b: MHF: Start DIALING_OUT_TIMEOUT for correct device

* commit '5d56b57b6fac07125f5462a6ed3dd3b1a546541b':
MHF: Start DIALING_OUT_TIMEOUT for correct device
90fe0f8fb81244f36b054cbb7ad3741d9095ac77 28-Jun-2014 Sunny Kapdi <sunnyk@codeaurora.org> am 1b1780bd: MHF: Broadcast connected state for HS

* commit '1b1780bd64223ee4cc4103b75316ccc0745cbcc5':
MHF: Broadcast connected state for HS
532e1d8c29aae81d5ffae6d05359d02f18f7ac82 28-Jun-2014 Nitin Srivastava <nitinsr@codeaurora.org> am 69d4ca45: (-s ours) Multi HF support

* commit '69d4ca45a25e86823fbdb754ca6a3995f8131d59':
Multi HF support
5fb07d78be94c96901614027d22e3590d01ce934 28-Jun-2014 Nitin Srivastava <nitinsr@codeaurora.org> am 139339cf: Bluetooth: Free bd_addr in avrcp getRcFeature callback

* commit '139339cf5dc27fc4ad154906d536ab12b02c5ae3':
Bluetooth: Free bd_addr in avrcp getRcFeature callback
c6dc76a4472bc698209add0c645eb368593411dd 28-Jun-2014 Nitin Srivastava <nitinsr@codeaurora.org> am 5f1aaa0f: BT: HDP: Add NULL check in cleanupApps

* commit '5f1aaa0fc4fc7e94c4f67de35a35ec6ca5ad9ec9':
BT: HDP: Add NULL check in cleanupApps
7a566bbe24c3618e3b21d6b7170d94bfd2f03089 28-Jun-2014 Zhihai Xu <zhihaixu@google.com> am e40925fc: Bluetooth: Added Shared Preferences to restore tethering preference

* commit 'e40925fc889d7f9dfc2a12c8165086cc7c312cc6':
Bluetooth: Added Shared Preferences to restore tethering preference
fcd64719a4a5e6271d9381843477922d62c1f391 28-Jun-2014 Hemant Gupta <hemantg@codeaurora.org> am ca2a13ee: Bluetooth-OPP: Enable support to send same file multiple times

* commit 'ca2a13ee25488f913766081e42daa2dce85d75aa':
Bluetooth-OPP: Enable support to send same file multiple times
a43a671fc1d8497029c6bcad0862c42819ac62cd 28-Jun-2014 Hemant Gupta <hemantg@codeaurora.org> am 90d9ea96: PBAP: Fix search by number issue for contacts.

* commit '90d9ea96c0b0f3209dc03667e21d14a13ca1f614':
PBAP: Fix search by number issue for contacts.
22a5c0144138a44098eea5e23aada96cad28ed7d 28-Jun-2014 Hemant Gupta <hemantg@codeaurora.org> am 4ffed8e8: Bluetooth: Map: Trim folder name in pushMessage and setPath

* commit '4ffed8e8fbde75ab5151cce325acf2a636e09c8f':
Bluetooth: Map: Trim folder name in pushMessage and setPath
13c835df04555331a1436fc6a49fc19dcc5c0298 28-Jun-2014 Hemant Gupta <hemantg@codeaurora.org> am 130969d1: (-s ours) PBAP: Compare Name and ID both for getting vcard by number

* commit '130969d18eadbd94361fe95bf16b8131cdea6168':
PBAP: Compare Name and ID both for getting vcard by number
9b2a39c9705daa1dad3d9b623d74ed11cb3ca730 28-Jun-2014 Nitin Srivastava <nitinsr@codeaurora.org> am 849da7cd: BT: HFP: Set VR flags to false when HS disconnects

* commit '849da7cd88ec65cb153e9d81d3e2ea78418ba181':
BT: HFP: Set VR flags to false when HS disconnects
945d1a7ea881391b7bf70db3e55429c7d8c329d5 28-Jun-2014 Zhihai Xu <zhihaixu@google.com> am 8808a0da: (-s ours) Merge "LE: Add API to configure MTU for a given connection (4/4) this patch is from broadcom(andre) bug:13571470 Change-Id: I4faf13f3daa535337b721a8b48e92334ed0ecb7c" into klp-wireless-dev

* commit '8808a0da77efae56d460398d90f44c5541051d5f':
LE: Add API to configure MTU for a given connection (4/4) this patch is from broadcom(andre) bug:13571470 Change-Id: I4faf13f3daa535337b721a8b48e92334ed0ecb7c
b0f93145a568855f5eeae746ef3661ff3679696e 28-Jun-2014 Prem Kumar <premk@google.com> am e4be9759: Add WRITE_APN_SETTINGS permission for access to Telephony

* commit 'e4be9759811b7aac31d92d982b3b5c65be716858':
Add WRITE_APN_SETTINGS permission for access to Telephony
ba2b45f046913865d3b46d244f20f4f802d7ec99 28-Jun-2014 Wei Wang <weiwa@google.com> am 28eff1a1: (-s ours) DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master.

* commit '28eff1a17b1e60f985f841faadde6420bf0d001f':
DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master.
8f5ad85c64ea27d0cc7f2de587a941efc3b69e30 28-Jun-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
afc04fcffad9713d5385894b41a1fb29c1d6ee96 28-Mar-2014 Andre Eisenbach <andre@broadcom.com> LE: Add notification sent and congestion callbacks (4/4)

This change introduces two new callbacks for applications to better
handle LE notification flow control and transport congestion. The
notification callback is invoked when the remote platform confirms an
indication or when a local notification has been passed to the
controller. No new notifications should be sent until a callback is
received.

Congestion callbacks are triggered when a GATT operation cannot be sent
to the local Bluetooth controller. Repeatedly calling
writeCharacteristic() for example will eventually trigger a congestion
callback. Applications cannot send additional data until a further
callback is received, indicating that the congestion has cleared up.

Change-Id: Ifa8de9c12d8d487e28fb5a1a5e05150a7fec90cb
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
143ebea17002b2f15ce61fd33701d5a67f17455b 26-Jun-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ifed05cea0d7ab6a34fa00f139eb534a2fbbf8f64
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
83faa1c29215f8fcf69e2444f54d24ddaf6e2da5 26-Jun-2014 Matthew Xie <mattx@google.com> am e5c2a9d1: Merge "Add null pointer check in A2DPService"

* commit 'e5c2a9d12a29baa007e17dfe62f13b28a3aea637':
Add null pointer check in A2DPService
e5c2a9d12a29baa007e17dfe62f13b28a3aea637 26-Jun-2014 Matthew Xie <mattx@google.com> Merge "Add null pointer check in A2DPService"
8d2c0c134fb75c8d82b0a6fdb9360a2b4aa6939b 25-Jun-2014 Baligh Uddin <baligh@google.com> am 7857404b: (-s ours) Import translations. DO NOT MERGE

* commit '7857404b0f4518d687bea446579976bc4382aa29':
Import translations. DO NOT MERGE
7857404b0f4518d687bea446579976bc4382aa29 25-Jun-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I5e2a582d15a176635680baeef844f2444e4e8f37
Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
d1d30b0340aa30982c85ba0d69f918ed127679ef 25-Jun-2014 Matthew Xie <mattx@google.com> am 663fb577: Merge "Use round() instead of ceil() in calculation of a2dp vol slider position"

* commit '663fb5771e20f117be2c14fe794b2594aabdc703':
Use round() instead of ceil() in calculation of a2dp vol slider position
663fb5771e20f117be2c14fe794b2594aabdc703 25-Jun-2014 Matthew Xie <mattx@google.com> Merge "Use round() instead of ceil() in calculation of a2dp vol slider position"
fb23c060031422c34aa8233cb3868d187f36a9dc 26-Jun-2014 Paul Jensen <pauljensen@google.com> Merge "Convert BluetoothTetheringDataTracker into a NetworkFactory."
689fb16c3dcca9a8d09a8572586a654b1ad38d7d 26-Jun-2014 Matthew Xie <mattx@google.com> am 83faa1c2: am e5c2a9d1: Merge "Add null pointer check in A2DPService"

* commit '83faa1c29215f8fcf69e2444f54d24ddaf6e2da5':
Add null pointer check in A2DPService
f3997eb0ef29986e9e27fb81f0667c2f19fae07f 26-Jun-2014 Andres Morales <anmorales@google.com> Merge "Making Bluetooth OPP file transfer intent generic"
9cf6c591c43c4dba90b5c2e26a5f93368682c9cc 25-Jun-2014 RoboErik <epastern@google.com> Merge "Disable debug messages that were left on"
8e0d927632cce4ad53df85fb7627b915c5fbd64b 24-Jun-2014 RoboErik <epastern@google.com> Disable debug messages that were left on

Forgot to disable with my last change.

Change-Id: I502e77071745bd5f9d98aa9ce963b927effc2d46
rc/com/android/bluetooth/avrcp/Avrcp.java
cd1ac06761c5c4d8ba0b5f95684cf029e276420b 25-Jun-2014 Baligh Uddin <baligh@google.com> am 8d2c0c13: (-s ours) am 7857404b: (-s ours) Import translations. DO NOT MERGE

* commit '8d2c0c134fb75c8d82b0a6fdb9360a2b4aa6939b':
Import translations. DO NOT MERGE
7af55657d171df8336cbcce0687d1225fe0f5312 25-Jun-2014 Matthew Xie <mattx@google.com> am d1d30b03: am 663fb577: Merge "Use round() instead of ceil() in calculation of a2dp vol slider position"

* commit 'd1d30b0340aa30982c85ba0d69f918ed127679ef':
Use round() instead of ceil() in calculation of a2dp vol slider position
732f591ff492661ea4a3593b5a5fb89c3fa7cf00 25-Jun-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
f08b93c4a2bdc3295163b11ddf8370071212feb1 23-Jun-2014 Matthew Xie <mattx@google.com> am ea10b480: am 7315070f: Merge "Fix signal strength indicator."

* commit 'ea10b480618028469d25bc6f4239ff74334a431a':
Fix signal strength indicator.
ea10b480618028469d25bc6f4239ff74334a431a 23-Jun-2014 Matthew Xie <mattx@google.com> am 7315070f: Merge "Fix signal strength indicator."

* commit '7315070f9513a498c915c06c9abed84cd14da11e':
Fix signal strength indicator.
7315070f9513a498c915c06c9abed84cd14da11e 23-Jun-2014 Matthew Xie <mattx@google.com> Merge "Fix signal strength indicator."
a40f0c0fba709eef58cf42775c5de03970c170ca 23-Jun-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I8eeb91bb2fc8e16fc7c7b7d736eb14a655a0d09c
Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
04be19286d311ef51ca50841b6a15ea7994fd3a5 13-Dec-2013 Danny Baumann <dannybaumann@web.de> Fix signal strength indicator.

Some devices don't check the service indicator, but only the signal
indicator. Don't give the false impression that the network signal is ok
when we're actually out of service for those devices.

Change-Id: I2e24daf13593439cbc23254fb4539cd250dbae89
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
cf8a01eeb41fc6420283ed7c3d7d94a463745b1a 23-Jun-2014 Andre Eisenbach <eisenbach@google.com> Merge "Reduce log verbosity in AdapterService"
20de1a6601e8aea7bbc9b9a8219cc616ffddae25 21-Jun-2014 Andre Eisenbach <eisenbach@google.com> Reduce log verbosity in AdapterService

Cleaned up log messages and use existing log functions to control all
debug messages in one place. Also removes unhelpful repetitive message
spam in the Settings app Bluetooth activity.

Change-Id: I7bfd79e06daad60f50742a45ebcdab936077b93e
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/AdapterService.java
5a84c6974b024e28e15ae853bda2599ebe4d8e6e 21-Jun-2014 Andre Eisenbach <eisenbach@google.com> Merge "LE: Add is_connected() function (3/3)"
19ca82e647e4b2c232d81b0e7b89e9c969c35831 20-Jun-2014 Baligh Uddin <baligh@google.com> am 1453841a: (-s ours) Import translations. DO NOT MERGE

* commit '1453841a64f4c0587cfb62bf4c4c4ae1cdd8d8c8':
Import translations. DO NOT MERGE
ff8a62e9b86fc4af25f36e13713e4e30842e0636 20-Jun-2014 RoboErik <epastern@google.com> Merge "Update Avrcp to use RemoteController"
8e3087169372b614cc1362d7efbccb4ec78c4cbe 20-Jun-2014 Baligh Uddin <baligh@google.com> am 19ca82e6: (-s ours) am 1453841a: (-s ours) Import translations. DO NOT MERGE

* commit '19ca82e647e4b2c232d81b0e7b89e9c969c35831':
Import translations. DO NOT MERGE
6e29e12add362546784126119f26f04fc760f021 19-Jun-2014 RoboErik <epastern@google.com> Update Avrcp to use RemoteController

Avrcp was using IRemoteControlDisplay directly. This converts it to
the public api instead.

Change-Id: I0740687ed20da69d3522e9e9e7dc55bb1f374ecc
rc/com/android/bluetooth/avrcp/Avrcp.java
1453841a64f4c0587cfb62bf4c4c4ae1cdd8d8c8 20-Jun-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Id0d736656d17a298ba82aa529907067359b07640
Auto-generated-cl: translation import
es/values-el/strings.xml
es/values-el/test_strings.xml
es/values-iw/strings.xml
3636f3319fc403e3bf995b6de71dc5e3f2864661 18-Jun-2014 Andre Eisenbach <eisenbach@google.com> LE: Add is_connected() function (3/3)

Change-Id: I71f64ff59e4602d2834f1c177310a36320e70ead
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
6fb74b225ec5efc8caef0fec82692e33392b8ecb 04-Jun-2014 Ganesh Ganapathi Batta <ganeshg@broadcom.com> Fix issue with converting byte array into unsigned integers

Bug 15411439

Change-Id: I921bb3bab6cbd6e09c22786dd90dd0cfbca59265
rc/com/android/bluetooth/btservice/AdapterProperties.java
58ff480f24ba9905edf86c98035f5e9ad76a453a 17-Jun-2014 Paul Jensen <pauljensen@google.com> Convert BluetoothTetheringDataTracker into a NetworkFactory.

bug:15407087

Change-Id: I0437ca52dedf73e8ec69ac82e46353f6fafc4a42
rc/com/android/bluetooth/pan/BluetoothTetheringNetworkFactory.java
rc/com/android/bluetooth/pan/PanService.java
1f3325d9432d6003bd73d171f6b65515e38fb78a 19-Jun-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
570d29b9037455134e86f5b653699b24155cc49b 18-Jun-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I74921f719b8ed43e671043142c57d2e337896acd
Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
1d203e2a24848d15dccb8ed1f7c0891c623125bd 18-Jun-2014 Andre Eisenbach <eisenbach@google.com> Merge "LE: Add ability to pass address type to GATT test command"
106b714a2e69fa9c0734d87a02ab7277c30f8960 04-Jun-2014 Ganesh Ganapathi Batta <ganeshg@broadcom.com> Fix issue with converting byte array into unsigned integers

Bug 15411439

Change-Id: I921bb3bab6cbd6e09c22786dd90dd0cfbca59265
rc/com/android/bluetooth/btservice/AdapterProperties.java
06f18fe2a860673305b0a77c9eae9374bfa3c40b 17-Jun-2014 Geoff Mendal <mendal@google.com> Revert Ying's fix for ub-mail-master snapped projects
Bug: 15593367
ests/Android.mk
ed4da7ddf12483849fbba7ea1890bddc880eb10c 13-Jun-2014 Ying Wang <wangying@google.com> Exclude only the test, not the jni.

Bug: 15593367
Change-Id: Iee1eccbd15cc79c9571c7cf8781c2ec8ccf3c64f
ndroid.mk
ests/Android.mk
571a0931bb54c655ea90a985372ddbf6ccc114b6 13-Jun-2014 Ying Wang <wangying@google.com> Disable the test build before we fix the email build.

Bug: 15593367
Change-Id: I348dfdda41b5b0be03ca8fcbd48545b5634d0a59
ndroid.mk
066ad9e16a548218b139424f758b92db7af34af2 06-Jun-2014 Mike Lockwood <lockwood@google.com> Move AVRCP Controller support to new BluetoothAvrcpController profile

Change-Id: I865f77c85d971bf06dbc0643722abad7f6b94ab9
ndroidManifest.xml
ni/Android.mk
ni/com_android_bluetooth.h
ni/com_android_bluetooth_avrcp.cpp
ni/com_android_bluetooth_avrcp_controller.cpp
ni/com_android_bluetooth_btservice_AdapterService.cpp
es/values/config.xml
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/Avrcp.java
rc/com/android/bluetooth/avrcp/Avrcp.java
rc/com/android/bluetooth/avrcp/AvrcpControllerService.java
rc/com/android/bluetooth/btservice/Config.java
5c86abdc7875a8fae28c57e3e36a0a8eaae5cb04 07-Feb-2014 Hemant Gupta <hemantg@codeaurora.org> [4/4] Add Support for AVRCP Controller Feature

- Provide support for AVRCP Controller CAT 1 and CAT 2
Passthrough commands.
- Fix bug in usage of percent volume change in absolute
volume case.

Change-Id: Ie753329a96c30343d92c421c5e0113ff3e624db6
ni/com_android_bluetooth_avrcp.cpp
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/Avrcp.java
c030f08f419d596c4aa216c9cca9867e7b5486f0 07-Jun-2014 Mike Lockwood <lockwood@google.com> A2DP Sink: Add support for BluetoothA2dpSink profile

Change-Id: If2c1b9b919c90e65a3808c9a55b554c0e899a9c2
ndroidManifest.xml
ni/Android.mk
ni/com_android_bluetooth.h
ni/com_android_bluetooth_a2dp_sink.cpp
ni/com_android_bluetooth_btservice_AdapterService.cpp
es/values/config.xml
rc/com/android/bluetooth/a2dp/A2dpSinkService.java
rc/com/android/bluetooth/a2dp/A2dpSinkStateMachine.java
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/btservice/Config.java
8d536f3db19e8ea7426e98e470dc15d10ecbae87 12-Jun-2014 Mike Lockwood <lockwood@google.com> Rename BluetoothHandsfreeClient to BluetoothHeadsetClient

This makes our terminology consistent with the existing BluetoothHeadset profile

Change-Id: I527977250cf9a34d55d01b357c5c438826e58156
ndroidManifest.xml
ni/com_android_bluetooth_hfpclient.cpp
rc/com/android/bluetooth/btservice/Config.java
rc/com/android/bluetooth/hfpclient/HandsfreeClientHalConstants.java
rc/com/android/bluetooth/hfpclient/HandsfreeClientService.java
rc/com/android/bluetooth/hfpclient/HandsfreeClientStateMachine.java
rc/com/android/bluetooth/hfpclient/HeadsetClientHalConstants.java
rc/com/android/bluetooth/hfpclient/HeadsetClientService.java
rc/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
c07f105ac5db80ae48a768223d1533daa7afb534 15-May-2014 Mike Lockwood <lockwood@google.com> Set HFP client profile off by default, enable via resource override rather than system property.

Change-Id: Ief080b21026c7b150835e044f800ccaf786bbd2c
es/values/config.xml
rc/com/android/bluetooth/btservice/Config.java
aebc726105204f8a7b977eb3556c14b5ba18a5ca 19-Aug-2013 Hemant Gupta <hemantg@codeaurora.org> Bluetooth: Add support for HFP Client role.

Implementation changes in Bluetooth App to support
HFP Client role.

Change-Id: I795f475c6a1548fd7cc68d0a02b22f30cf5a182b
ndroidManifest.xml
ni/Android.mk
ni/com_android_bluetooth.h
ni/com_android_bluetooth_btservice_AdapterService.cpp
ni/com_android_bluetooth_hfpclient.cpp
es/values/config.xml
rc/com/android/bluetooth/btservice/Config.java
rc/com/android/bluetooth/hfpclient/HandsfreeClientHalConstants.java
rc/com/android/bluetooth/hfpclient/HandsfreeClientService.java
rc/com/android/bluetooth/hfpclient/HandsfreeClientStateMachine.java
b83d7c6016ccd2b95b5e3b08581f5e2b21d68905 12-Jun-2014 Mike Lockwood <lockwood@google.com> Rename BluetoothHandsfreeClient to BluetoothHeadsetClient

This makes our terminology consistent with the existing BluetoothHeadset profile

Change-Id: I527977250cf9a34d55d01b357c5c438826e58156
ndroidManifest.xml
ni/com_android_bluetooth_hfpclient.cpp
rc/com/android/bluetooth/btservice/Config.java
rc/com/android/bluetooth/hfpclient/HandsfreeClientHalConstants.java
rc/com/android/bluetooth/hfpclient/HandsfreeClientService.java
rc/com/android/bluetooth/hfpclient/HandsfreeClientStateMachine.java
rc/com/android/bluetooth/hfpclient/HeadsetClientHalConstants.java
rc/com/android/bluetooth/hfpclient/HeadsetClientService.java
rc/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
1e9f8a14e120e8786711abdd4a965236191c87ad 31-May-2014 Sharvil Nanavati <sharvil@google.com> Expose wake lock / wake alarm functionality to bluedroid.

Change-Id: I267ff1d19a0d1ef5ad9a290c7654d7e6ee3a9f15
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/btservice/AdapterService.java
a2be7670787cc4576386bf4a8baea4b88d35e90b 06-Jun-2014 Prerepa Viswanadham <dham@google.com> Refactor ScanClient scan settings to one place
Scan_mode_low_power 500ms/5000ms (10%)
scan_mode_balanced 2000ms/5000ms (40%)
scan_mode_low_latency 5000ms/5000ms (100%)

Change-Id: I5f24dc24fc86eba35c645a968e1c80934e3dd2d5
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/ScanClient.java
c145fd074dac20e6c9836ee6e900538f2cc7dd54 05-Jun-2014 Prerepa Viswanadham <dham@google.com> Use controller provided information about it BLE L feature capabilities

Change-Id: Ia3099c1df2664b79392b2a4f7e3e47d1507a9efe
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
d0f1d36e653e1b91337743b92472ba4ea97c538b 22-May-2014 Ganesh Ganapathi Batta <ganeshg@broadcom.com> Add support for retrieving local LE features via get_adapter_properties

Change-Id: Iada59d0c7aa776f8b3aa25abec1a7612224a43bb
rc/com/android/bluetooth/btservice/AbstractionLayer.java
rc/com/android/bluetooth/btservice/AdapterProperties.java
6f1d727834316ee78c9c897965b254fa0316a065 07-Jan-2014 Hemant Gupta <hemantg@codeaurora.org> PBAP: Fix crash in com.android.bluetooth

This patch will add the changes to catch the
CursorWindowAllocationException at all the places where cursor
is used for quering operations. Without this patch, crash was
observed in com.android.bluetooth in stress test of BT On/off
multiple times.

FATAL EXCEPTION: main
android.database.CursorWindowAllocationException:
Cursor window could not be created from binder.
com.android.bluetooth.pbap.BluetoothPbapVcardManager.
getCallHistorySize(BluetoothPbapVcardManager.java)

Change-Id: I6a4fadb949969dca453cff0fe84a25d849063573
rc/com/android/bluetooth/pbap/BluetoothPbapUtils.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
ddf1c3d66c38b6ad771608eda1c57656eee57332 11-Jun-2014 Andre Eisenbach <eisenbach@google.com> LE: Add ability to pass address type to GATT test command

Currently the GATT test command to connect a remote device assumes a
public Bluetooth device address. This patch adds the ability to pass in
the address type via the test command interface.

Change-Id: Ic892b7bf5f9b261152492778da0c78b184b5e9b2
rc/com/android/bluetooth/gatt/GattDebugUtils.java
55d81a3828bc9d227b77ea840fa3dffcbc4262d2 10-Jun-2014 Benson Huang <benson.huang@mediatek.com> [BT] Fix bug: MAP client can not get MessageListing for draft folder

Currently c.getColumnIndex(Mms.PRIORITY) in setPriority method is returning
-1 which is causing c.getInt(-1) to throw a java.lang.IllegalStateException.

The fix is to add the column Mms.PRIORITY in MMS_PROJECTION

Bug 15069197 and 15071221

Change-Id: I9f296415efd5e10970d9f24652cab1022dad5efd
Signed-off-by: Benson Huang <benson.huang@mediatek.com>
rc/com/android/bluetooth/map/BluetoothMapContent.java
df0c1b598b33732fd237f90f8c4fc2c89c20d3ed 10-Jun-2014 Dmitry Grinberg <dmitrygr@google.com> am 95b1a30f: (-s ours) am 73aa6430: DO NOT MERGE: Give proper package name to wakelock

* commit '95b1a30fb28fea0be5d225f671c8ee89edc348e0':
DO NOT MERGE: Give proper package name to wakelock
2ef025964e550f05c26669e4be2233d4eed23696 10-Jun-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
95b1a30fb28fea0be5d225f671c8ee89edc348e0 09-Jun-2014 Dmitry Grinberg <dmitrygr@google.com> am 73aa6430: DO NOT MERGE: Give proper package name to wakelock

* commit '73aa6430842f1fe1c77d2e075df812072eb3d905':
DO NOT MERGE: Give proper package name to wakelock
b824e2624524d039b12ce3b7de2747ff558bfe94 06-Jun-2014 Mike Lockwood <lockwood@google.com> Move AVRCP Controller support to new BluetoothAvrcpController profile

Change-Id: I865f77c85d971bf06dbc0643722abad7f6b94ab9
ndroidManifest.xml
ni/Android.mk
ni/com_android_bluetooth.h
ni/com_android_bluetooth_avrcp.cpp
ni/com_android_bluetooth_avrcp_controller.cpp
ni/com_android_bluetooth_btservice_AdapterService.cpp
es/values/config.xml
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/Avrcp.java
rc/com/android/bluetooth/avrcp/Avrcp.java
rc/com/android/bluetooth/avrcp/AvrcpControllerService.java
rc/com/android/bluetooth/btservice/Config.java
9ebf7624eb97e76d34ceceebf4ab1558d73df246 07-Jun-2014 Mike Lockwood <lockwood@google.com> A2DP Sink: Add support for BluetoothA2dpSink profile

Change-Id: If2c1b9b919c90e65a3808c9a55b554c0e899a9c2
ndroidManifest.xml
ni/Android.mk
ni/com_android_bluetooth.h
ni/com_android_bluetooth_a2dp_sink.cpp
ni/com_android_bluetooth_btservice_AdapterService.cpp
es/values/config.xml
rc/com/android/bluetooth/a2dp/A2dpSinkService.java
rc/com/android/bluetooth/a2dp/A2dpSinkStateMachine.java
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/btservice/Config.java
67c06156691d30294547979559ffb49a9579463d 09-Jun-2014 Jay Civelli <jcivelli@google.com> Merge "Adding a method BluetoothDevice.isConnected()"
31bc82d7349bf7364f25884c13cff6f24e48a4ee 09-Jun-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ibba0693f1a764ed6d43b9098a2e1357df2688324
Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
c453f0f533556d8ffbb7a87ca09d6b30e259978e 31-May-2014 Sharvil Nanavati <sharvil@google.com> Expose wake lock / wake alarm functionality to bluedroid.

Change-Id: I267ff1d19a0d1ef5ad9a290c7654d7e6ee3a9f15
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/btservice/AdapterService.java
6017e517d975d079dd09c10a34ed4a8efd4cbef9 07-Jun-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
32088854fd6a8bb5e570a4a1df4eaf2eb19d7ae3 06-Jun-2014 Prerepa Viswanadham <dham@google.com> Refactor ScanClient scan settings to one place
Scan_mode_low_power 500ms/5000ms (10%)
scan_mode_balanced 2000ms/5000ms (40%)
scan_mode_low_latency 5000ms/5000ms (100%)

Change-Id: I5f24dc24fc86eba35c645a968e1c80934e3dd2d5
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/ScanClient.java
e65500db39422398f3b87c4f340e66fdfec7e328 05-Jun-2014 Wei Wang <weiwa@google.com> Add missing licenses.

Change-Id: Ie07e3b8940e8caec985aad4aee5aaf283b5af37e
rc/com/android/bluetooth/gatt/AdvertiseClient.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
e74e332c8de3c5d2abd56868ba7662d68c797236 06-Jun-2014 Wei Wang <weiwa@google.com> am b5bdb625: Add device capability config for new BLE features(MA, scan filter).(2/3)

* commit 'b5bdb625226aca1650ba4c57fd94c8f9b4aa7750':
Add device capability config for new BLE features(MA, scan filter).(2/3)
73aa6430842f1fe1c77d2e075df812072eb3d905 05-Jun-2014 Dmitry Grinberg <dmitrygr@google.com> DO NOT MERGE: Give proper package name to wakelock

Bug: 15442409
Change-Id: Ibae4eb97f8607b91f8acb2474704443ad431a6f5
ni/com_android_bluetooth_btservice_AdapterService.cpp
0c80f016af7f313611b0bac77da6e3ee695c0c73 05-Jun-2014 Wei Wang <weiwa@google.com> Add missing licenses.

Change-Id: Ie07e3b8940e8caec985aad4aee5aaf283b5af37e
rc/com/android/bluetooth/gatt/AdvertiseClient.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
cefee9c44890a0943a9fd7c2891324fd81d50b28 05-Jun-2014 Prerepa Viswanadham <dham@google.com> Use controller provided information about it BLE L feature capabilities

Change-Id: Ia3099c1df2664b79392b2a4f7e3e47d1507a9efe
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
7aa3a71e508e4f95a0a74f41ab8389979809191b 08-May-2014 Jay Civelli <jcivelli@google.com> Adding a method BluetoothDevice.isConnected()

Adding a new method to BluetoothDevice that lets callers know whether a remote device is
connected.

Change-Id: Ia8ad2e3189d08b63832634bdf804656b8d013820
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
5fd10cb1c74f60859287332cd34c44ca8a923f22 04-Jun-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I490b80297c2f2623c088bb3df30b6e54e2ce92d3
Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
29804d82d8c5bf0ba17c8ae13bfc943508a1c203 04-Jun-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
cf7cb8478523185da2ff851bb0de96fe95b3e77c 31-May-2014 Wei Wang <weiwa@google.com> Fix build.

Change-Id: I92461859b65dac554650d7928bfddbfe9d80c2fe
rc/com/android/bluetooth/gatt/ScanClient.java
8333a1b99994e9d8986dbca44989c943c219e36f 31-May-2014 Prerepa Viswanadham <dham@google.com> Set scan parameters in ScanClient based on BluetoothLeScanSettings
configuration

scan_mode scan_window_ms scan_interval_ms
SCAN_MODE_LOW_POWER 500 5000
SCAN_MODE_BALANCED 1000 5000
SCAN_MODE_LOW_LATENCY 2500 5000

Change-Id: I2382c7b584b102555f175a94206c4379141af3fa
rc/com/android/bluetooth/gatt/ScanClient.java
ac4640647b4dfae61cc2a8c37d3d798bdc82a553 22-May-2014 Ganesh Ganapathi Batta <ganeshg@broadcom.com> Add support for retrieving local LE features via get_adapter_properties

Change-Id: Iada59d0c7aa776f8b3aa25abec1a7612224a43bb
rc/com/android/bluetooth/btservice/AbstractionLayer.java
rc/com/android/bluetooth/btservice/AdapterProperties.java
b5bdb625226aca1650ba4c57fd94c8f9b4aa7750 02-Jun-2014 Wei Wang <weiwa@google.com> Add device capability config for new BLE features(MA, scan filter).(2/3)

Fixes b/15387925.

Change-Id: I7cbcdd340fca7965f2be2c0d2a938e7646dc6849
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
c92b13ad9671810e6f10bbfce3032d33765f0a15 02-Jun-2014 Wei Wang <weiwa@google.com> Add device capability config for new BLE features(MA, scan filter).(2/3)

Fixes b/15387925.

Change-Id: I7cbcdd340fca7965f2be2c0d2a938e7646dc6849
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
07df536d82b1fe59bbf7d3ba5bed1ecf5aab61dc 02-Jun-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I26758197682725fdb74d2f26789d5635864695c3
Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
8426b4392456869935f90bf51be68ce198a86c01 31-May-2014 Wei Wang <weiwa@google.com> Fix build.

Change-Id: I92461859b65dac554650d7928bfddbfe9d80c2fe
rc/com/android/bluetooth/gatt/ScanClient.java
6e2fce02940bde40a2c8a48a725e9fa0157bde6c 31-May-2014 Prerepa Viswanadham <dham@google.com> Set scan parameters in ScanClient based on BluetoothLeScanSettings
configuration

scan_mode scan_window_ms scan_interval_ms
SCAN_MODE_LOW_POWER 500 5000
SCAN_MODE_BALANCED 1000 5000
SCAN_MODE_LOW_LATENCY 2500 5000

Change-Id: I2382c7b584b102555f175a94206c4379141af3fa
rc/com/android/bluetooth/gatt/ScanClient.java
6c984a7012ef5dee09b4e1f6d17a6ddc3ae0bb11 31-May-2014 Wei Wang <weiwa@google.com> am 80780da9: Add protection for controller timeout/failure, maximum number of advertisers, filters etc.

* commit '80780da923f52a6b5a80f8619cf3e735970eaad9':
Add protection for controller timeout/failure, maximum number of advertisers, filters etc.
277af4eeb62a96a28121c6461f5ed2d5e16f6cf5 31-May-2014 Wei Wang <weiwa@google.com> am 1a1d5f65: only stop ble scan when it\'s already started.

* commit '1a1d5f652d44b98d3b8ec73e1bc5dc19b923eb42':
only stop ble scan when it's already started.
fa13d4471d52a5780eb4c4efcedff6778060f7fa 31-May-2014 Wei Wang <weiwa@google.com> Merge diffs from API review comments(2/2).

Change-Id: I7316ec4fe134268927b27c14e421e6e3fc31b59f
rc/com/android/bluetooth/gatt/AdvertiseClient.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
rc/com/android/bluetooth/gatt/ScanClient.java
80780da923f52a6b5a80f8619cf3e735970eaad9 26-May-2014 Wei Wang <weiwa@google.com> Add protection for controller timeout/failure, maximum number of
advertisers, filters etc.

fixes b/15348260.

Change-Id: Ie5a460a7f042cdeba4c1e63498fd6db9dadbb66f
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
rc/com/android/bluetooth/gatt/ScanFilterQueue.java
1927f586b9e99411dace890fe3860b39140b1f66 30-May-2014 Wei Wang <weiwa@google.com> am 80e7d011: Changes due to addressing BLE API review comments

* commit '80e7d011fdb511a6583258458e97821176866baa':
Changes due to addressing BLE API review comments
1a1d5f652d44b98d3b8ec73e1bc5dc19b923eb42 22-May-2014 Wei Wang <weiwa@google.com> only stop ble scan when it's already started.

Fixes b/15174583

Change-Id: I3068254c576e8735ffb47d89f4bb8d5a719891c9
rc/com/android/bluetooth/gatt/GattService.java
f3e3ade729080636d0a3e9224ee205183fe11fa0 26-May-2014 Wei Wang <weiwa@google.com> Add protection for controller timeout/failure, maximum number of
advertisers, filters etc.

Change-Id: I94b719ddc0d9943c1a3c304285969d4c80e50a69
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
rc/com/android/bluetooth/gatt/ScanFilterQueue.java
7a02049bb3835c66e4b26700b6606b0ca5db7c6e 29-May-2014 Mike Lockwood <lockwood@google.com> Fix arguments to AudioManager.setBluetoothA2dpDeviceConnectionState()

Change-Id: I2a9742bc2e1127f56fafed574794f81578872681
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
9537b0e4648a0c197392d3276b46681523d5f0bc 29-May-2014 Mike Lockwood <lockwood@google.com> Fix arguments to AudioManager.setBluetoothA2dpDeviceConnectionState()

Change-Id: I2a9742bc2e1127f56fafed574794f81578872681
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
415f46820359ec3e4923d4bbc6923967bc85dbce 28-May-2014 Matthew Xie <mattx@google.com> Merge "Change error message to verbose to avoid spamming"
8799f44e07ff7cde70a8d58893e995d3a9fa1e76 28-May-2014 Matthew Xie <mattx@google.com> Change error message to verbose to avoid spamming

bug 15116703

Change-Id: Ia03253f37a273d3942a197d5a6ab1398ef7935fa
ni/com_android_bluetooth_btservice_AdapterService.cpp
90b73254c07461efcbe1548d55053f19a03b0be4 28-May-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I026bad69bbcd5fd3768f90893e248c251ef745d1
Auto-generated-cl: translation import
es/values-iw/strings.xml
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
80e7d011fdb511a6583258458e97821176866baa 21-May-2014 Wei Wang <weiwa@google.com> Changes due to addressing BLE API review comments

Change-Id: I27b94952a243bf4fdbebdc103e7d541ce23efa3f
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/AdvertiseClient.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
rc/com/android/bluetooth/gatt/ScanClient.java
rc/com/android/bluetooth/gatt/ScanFilterQueue.java
8d30b1b99a6628fcd32f61721a3ff7f05d00244a 26-May-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ia0b1f4dcc0c9b4149091dbdd6a9e77bacf3e3fe9
Auto-generated-cl: translation import
es/values-el/strings.xml
es/values-el/test_strings.xml
b0b958e9d0bc6b67777e9f3660c3b4e28180f480 24-May-2014 Matthew Xie <mattx@google.com> Revert "Provide bluedroid with wakelock access as a temporary fix"

This reverts commit cfba316c529471af6072d836957d06496cc1b554.
ni/Android.mk
ni/com_android_bluetooth_btservice_AdapterService.cpp
a03d2e10a067bdd87b608e73af2c3cfc02d5dd50 23-May-2014 Dmitry Grinberg <dmitrygr@google.com> am d0ff89bb: am 99b5e99f: Merge "Provide bluedroid with wakelock access as a temporary fix" into klp-modular-dev

* commit 'd0ff89bb19edc1bb2ba4bfe5077328fa56852e57':
Provide bluedroid with wakelock access as a temporary fix
d0ff89bb19edc1bb2ba4bfe5077328fa56852e57 23-May-2014 Dmitry Grinberg <dmitrygr@google.com> am 99b5e99f: Merge "Provide bluedroid with wakelock access as a temporary fix" into klp-modular-dev

* commit '99b5e99f62da622a1ae6b3ad87a52339809cd69a':
Provide bluedroid with wakelock access as a temporary fix
99b5e99f62da622a1ae6b3ad87a52339809cd69a 23-May-2014 Dmitry Grinberg <dmitrygr@google.com> Merge "Provide bluedroid with wakelock access as a temporary fix" into klp-modular-dev
cfba316c529471af6072d836957d06496cc1b554 22-May-2014 Dmitry Grinberg <dmitrygr@google.com> Provide bluedroid with wakelock access as a temporary fix

Timer subsystem in bluedroid does not handle sleep. Letting it keep
the device awake for its (hopefully) short-lived timers' lives helps.

Change-Id: I0512614314950209484852df4bcfd43c6c47493b
ni/Android.mk
ni/com_android_bluetooth_btservice_AdapterService.cpp
233a9ce2117ae01d2ead214f0629b4aa1ff0ad85 21-May-2014 Wei Wang <weiwa@google.com> Changes due to addressing BLE API review comments

Change-Id: I27b94952a243bf4fdbebdc103e7d541ce23efa3f
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/AdvertiseClient.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
rc/com/android/bluetooth/gatt/ScanClient.java
rc/com/android/bluetooth/gatt/ScanFilterQueue.java
bfb222069971808621cf0e1fd80584eca7372060 22-May-2014 Wei Wang <weiwa@google.com> only stop ble scan when it's already started.

Change-Id: I3068254c576e8735ffb47d89f4bb8d5a719891c9
rc/com/android/bluetooth/gatt/GattService.java
d379f2dd23cf0d237c2a251279a1ff0d355f1ed7 22-May-2014 Wei Wang <weiwa@google.com> only stop ble scan when it's already started.

Change-Id: I3068254c576e8735ffb47d89f4bb8d5a719891c9
rc/com/android/bluetooth/gatt/GattService.java
1321cd814a7406260ba6282d9c71e1a2d8925262 03-Oct-2013 Hemant Gupta <hemantg@codeaurora.org> PBAP: Check for spurious entries of searched contacts

This patch adds the check to limit the search if we already
have got the contact name by number so that same contact
will not be getting searched more than one number of time.

Change-Id: If4a26433e28cad90394833b51cc3ff0d0bcf7e36
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
6d5665f9d91070bfe02f872c7d5d63ea4685edf9 22-May-2014 Baligh Uddin <baligh@google.com> am e45476ef: (-s ours) am 0abd4c22: (-s ours) Import translations. DO NOT MERGE

* commit 'e45476ef376a2c57135888c5fe375661192c0098':
Import translations. DO NOT MERGE
e45476ef376a2c57135888c5fe375661192c0098 22-May-2014 Baligh Uddin <baligh@google.com> am 0abd4c22: (-s ours) Import translations. DO NOT MERGE

* commit '0abd4c2238a04f3064ffcbcf662bf225173ea556':
Import translations. DO NOT MERGE
0abd4c2238a04f3064ffcbcf662bf225173ea556 21-May-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I9394c18a87c01bf5d591f13c244390e61a2bc6f1
Auto-generated-cl: translation import
es/values-de/strings.xml
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
d74ba4930e66087ecfe7e307f1a27e895df31d97 21-May-2014 Mike Lockwood <lockwood@google.com> Merge "[4/4] Add Support for AVRCP Controller Feature" into klp-wireless-dev
ccd5f131d51ef8019c87628b992bc67cbbcc2ea6 21-May-2014 Wei Wang <weiwa@google.com> Add scan response as an advertising parameter(2/2).

Change-Id: Ib0c86b81b9a2e0dd4110275c804e814451231966
rc/com/android/bluetooth/gatt/AdvertiseClient.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
b16d4b64de7643ba9c28fc62f768463cde1f9420 21-May-2014 Wei Wang <weiwa@google.com> Add scan response as an advertising parameter(2/2).

Change-Id: Ib0c86b81b9a2e0dd4110275c804e814451231966
rc/com/android/bluetooth/gatt/AdvertiseClient.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
1a2f87a202a4d634f0b6b5b6e9a8545796207288 20-May-2014 Wei Wang <weiwa@google.com> Revert "Revert "Use state machine in gatt service to handle different state transitions. For this CL only normal BLE scans are moved to state machine.""

This reverts commit e68125be766dac23f9b346464e3d84e078132914.

Change-Id: I11bc9d84390043f189d268916bc681e68deea160
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/AdvertiseClient.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
rc/com/android/bluetooth/gatt/ScanClient.java
rc/com/android/bluetooth/gatt/ScanFilterQueue.java
e68125be766dac23f9b346464e3d84e078132914 20-May-2014 Wei Wang <weiwa@google.com> Revert "Use state machine in gatt service to handle different state transitions. For this CL only normal BLE scans are moved to state machine."

This reverts commit 3c6c305ebdfcaf239108f775f8ee2db2a0459c0f.

Change-Id: Ib1601bba4fe9d38a338ecf86740b20fcaccfa48f
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/AdvertiseClient.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
rc/com/android/bluetooth/gatt/ScanClient.java
rc/com/android/bluetooth/gatt/ScanFilterQueue.java
3c6c305ebdfcaf239108f775f8ee2db2a0459c0f 07-May-2014 Wei Wang <weiwa@google.com> Use state machine in gatt service to handle different state
transitions.
For this CL only normal BLE scans are moved to state machine.

Change-Id: I27376c7826544ca41aad156deefcd6a63d6cefbb
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/AdvertiseClient.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
rc/com/android/bluetooth/gatt/ScanClient.java
rc/com/android/bluetooth/gatt/ScanFilterQueue.java
1d7aaff7194ee04a8f3c8ddb0a94c1d27776de8f 08-May-2014 Wei Wang <weiwa@google.com> Changes due to the rename of isShortUuid to is16BitUuid.

Change-Id: I6a822ebcbe55d1e3162c3f3374278bf7f0adea5f
rc/com/android/bluetooth/gatt/GattService.java
628441e02c280f8f48adba0ade3c7028cbcdeec2 07-May-2014 Wei Wang <weiwa@google.com> Use state machine in gatt service to handle different state
transitions.
For this CL only normal BLE scans are moved to state machine.

Change-Id: I27376c7826544ca41aad156deefcd6a63d6cefbb
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/AdvertiseClient.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceStateMachine.java
rc/com/android/bluetooth/gatt/ScanClient.java
rc/com/android/bluetooth/gatt/ScanFilterQueue.java
468f938001cd5dc7912fc8779c00987c44aafab2 15-May-2014 Mike Lockwood <lockwood@google.com> Set HFP client profile off by default, enable via resource override rather than system property.

Change-Id: Ief080b21026c7b150835e044f800ccaf786bbd2c
es/values/config.xml
rc/com/android/bluetooth/btservice/Config.java
a4b39a558accff559561d60dbdafe9cf457a430b 15-May-2014 Mike Lockwood <lockwood@google.com> Merge "[4/4] Bluetooth: Add support for HFP Client role." into klp-wireless-dev
790352c7ff44eec4bb2458bea79c71e5b86c3206 15-May-2014 Mike Lockwood <lockwood@google.com> Merge "Submitted on behalf of 3rd party copied from packages/apps/Bluetooth/" into klp-wireless-dev
88d774ebc08d875d54db6b13cec06c8ce3d0925a 13-May-2014 Prerepa Viswanadham <dham@google.com> Improve name of api.

Change-Id: Ib35203a46f74aed43e2ce32dba02755016d84998
rc/com/android/bluetooth/gatt/GattService.java
f745ace608784e226a78170bf5a24fe114f1026f 10-May-2014 Prerepa Viswanadham <dham@google.com> set scan parameters in BT stack. Apply the most demanding request
in terms of duty cycle for all outstanding requests.

Change-Id: Iee460003d210455ab180367f3518bfb10a6c2539
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/ScanClient.java
53f26c079f676b3a72a20de4e30f075057d3777d 09-May-2014 Prerepa Viswanadham <dham@google.com> LE: Add API to set scan interval and window (3/4)

Drop client_if from api
Change-Id: I5ad339573c5fec28b22d8c4c5949eaf0d4d118aa
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
63ee04788c7384779eadb10f0c2cd10779ebfb43 13-May-2014 Prerepa Viswanadham <dham@google.com> Improve name of api.

Change-Id: Ib35203a46f74aed43e2ce32dba02755016d84998
rc/com/android/bluetooth/gatt/GattService.java
4afeeed1972ac2de34496d3d1c0dd70ef0e5d75d 12-May-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I3638aa454e371c934cc70e11d7243f6179fe0ebf
Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
es/values-km-rKH/test_strings.xml
dd2d4b97992bfa4bb549fc5e61b0a7c02acc013a 10-May-2014 Prerepa Viswanadham <dham@google.com> set scan parameters in BT stack. Apply the most demanding request
in terms of duty cycle for all outstanding requests.

Change-Id: Iee460003d210455ab180367f3518bfb10a6c2539
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/ScanClient.java
c8e3bda018603f40aabf62e2fb59615b24039634 09-May-2014 Prerepa Viswanadham <dham@google.com> LE: Add API to set scan interval and window (3/4)

Drop client_if from api
Change-Id: I5ad339573c5fec28b22d8c4c5949eaf0d4d118aa
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
709ec52d8053ccbdc00ccf463d35f1f6b91fa41a 19-Aug-2013 Hemant Gupta <hemantg@codeaurora.org> [4/4] Bluetooth: Add support for HFP Client role.

Implementation changes in Bluetooth App to support
HFP Client role.

Change-Id: I795f475c6a1548fd7cc68d0a02b22f30cf5a182b
ndroidManifest.xml
ni/Android.mk
ni/com_android_bluetooth.h
ni/com_android_bluetooth_btservice_AdapterService.cpp
ni/com_android_bluetooth_hfpclient.cpp
es/values/config.xml
rc/com/android/bluetooth/btservice/Config.java
rc/com/android/bluetooth/hfpclient/HandsfreeClientHalConstants.java
rc/com/android/bluetooth/hfpclient/HandsfreeClientService.java
rc/com/android/bluetooth/hfpclient/HandsfreeClientStateMachine.java
7d84dc7f7165c69e7d84b50bd21f8a63fa7df275 29-Apr-2014 Hemant Gupta <hemantg@codeaurora.org> Submitted on behalf of 3rd party copied from
packages/apps/Bluetooth/

Initial commit for HFP Client

Change-Id: I0dabd9df1cafc48d5e30e29c36898b6d1af6e874
ni/com_android_bluetooth_hfpclient.cpp
rc/com/android/bluetooth/hfpclient/HandsfreeClientHalConstants.java
rc/com/android/bluetooth/hfpclient/HandsfreeClientService.java
rc/com/android/bluetooth/hfpclient/HandsfreeClientStateMachine.java
39fadfcd92a969a750dafb8e37c468daff9c1054 08-May-2014 Wei Wang <weiwa@google.com> Changes due to the rename of isShortUuid to is16BitUuid.

Change-Id: I6a822ebcbe55d1e3162c3f3374278bf7f0adea5f
rc/com/android/bluetooth/gatt/GattService.java
0d1322483285ccc9ca7bedf515821c5c105a44e6 30-Dec-2013 Hemant Gupta <hemantg@codeaurora.org> PBAP: Change string search comparison from NULL to empty

This change compares the searchValue atribute to empty
string value rather than comparing with the NULL object
since the searchValue object itself is never NULL and
only the value becomes an empty string. Without this
patch DUT was returning no list on Vcard-listing request
by PBAP Client.

Change-Id: I20cdfc0246af3057ba8ee268dee3de1893810638
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
c592e5a6de0011cd60f23ac18a7bd56d8eeb5dd1 07-Jan-2014 Hemant Gupta <hemantg@codeaurora.org> PBAP: Fix crash in com.android.bluetooth

This patch will add the changes to catch the
CursorWindowAllocationException at all the places where cursor
is used for quering operations. Without this patch, crash was
observed in com.android.bluetooth in stress test of BT On/off
multiple times.

FATAL EXCEPTION: main
android.database.CursorWindowAllocationException:
Cursor window could not be created from binder.
com.android.bluetooth.pbap.BluetoothPbapVcardManager.
getCallHistorySize(BluetoothPbapVcardManager.java)

Change-Id: I6a4fadb949969dca453cff0fe84a25d849063573
rc/com/android/bluetooth/pbap/BluetoothPbapUtils.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
05a3b3562d1f114c5b9875ddfea5d913575ecaf0 07-May-2014 Narayan Kamath <narayan@google.com> Fix build: Build Bluetooth as a 32 bit app.

external/bluetooth/bluedroid does not compile for 64 bit
targets.

Change-Id: If7db429690c13bd9156f98b110930f4c9ca0b2c7
ndroid.mk
ni/Android.mk
b17782509bd34201cf0daa62dadc929d65eb98b0 19-Mar-2014 Zhihai Xu <zhihaixu@google.com> MHF: Disconnect audio for HS1 before disconnecting ACL.

When HS2 is connected while call is active on HS1,
disconnect audio first followed by disconnecting ACL
for HS1.
from QCOM
Change-Id: I53b6fedd47008cf0d6d65a72f744b2df4a198e34
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
34409f35db6e9ca74f727e3fe92141388ae5b069 16-Jul-2013 Ganesh Ganapathi Batta <ganeshg@broadcom.com> Set profile priorities only after SDP completion

Set the profile priorities only after SDP completion.
Perform lookup and set profile priorities to ON, only for
profiles supported by bonded BT device.
CR BLTH02405767

Change-Id: I83fe6e772993b7c41c6a86f504d2b09ea38b2356

Conflicts:
src/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
1a39ecdeaad346e86ca95f802519c8c58edfc4b9 07-Feb-2014 Hemant Gupta <hemantg@codeaurora.org> Bluetooth-OPP: Handle HID mouse right click event

This change will handle mouse right click event to display only
context menu with options Open and Clear. Otherwise, during HID mouse
right click two popup will be displayed context menu and Open option
while selecting context menu, option app crash is observed.

Change-Id: I8328f87f9c4bc007cd46a5567268621499e35343
rc/com/android/bluetooth/opp/BluetoothOppTransferHistory.java
18591a7894c5e4516491438c2e758adf8d2ade90 18-Apr-2014 Ganesh Ganapathi Batta <ganeshg@broadcom.com> Add transport param to Connect APIs

Support for passing preferred transport for GATT connections as part of
Connect APIs

Change-Id: Ibeafb922aec954d1f2e693b422e264fbc87468f2
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
84748eda69cbd96a761288090fb248f5fe861332 15-Mar-2014 Sunny Kapdi <sunnyk@codeaurora.org> MHF: Start DIALING_OUT_TIMEOUT for correct device

When processing Dial request, start DIALING_OUT_TIMEOUT
timer for correct matching device.
Also add null check for device retrieved from
getDeviceForMessage()

Change-Id: Id9946c6b91ca1b23a24dfe408a81db25b9dfb86a
CRs-Fixed: 612278
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
c1f19a57e4366b2f89a1fbb03f3626856b5da482 15-Mar-2014 Sunny Kapdi <sunnyk@codeaurora.org> MHF: Broadcast connected state for HS

- Since telephony doesn't store list of connected HS, BT needs
to broadcast connected state for an already connected HS,
when other HS disconnects. This will notify telephony that
even though one HS is disconnected, but still there is one
other connected HS. This fixes call routing issue to BT HS
from phone UI.

- Set mActiveScoDevice to null when HS disconnects while
it has SCO connected for ongoing call.

Change-Id: I91aba22844938b61afc0bac52b5b6de95354f491
CRs-Fixed: 619841
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
343b96e3995da4038b614384dcdad8a6494b4bc4 15-Mar-2014 Nitin Srivastava <nitinsr@codeaurora.org> Multi HF support

1. Added support for Multi HF connections
in Bluetooth application.
2. All connection transition states for
2nd HS onwards is handled in new state-
MultiHFPending.
3. The changes are done to handle proper
state transition for all connected HS.

Change-Id: I033ae57943e50273f9d3cac4c5f8d1624cb9ee09
ni/com_android_bluetooth_hfp.cpp
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/hfp/AtPhonebook.java
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
fd80b9517bf8bc45257af83074114d493ba7d984 11-Mar-2014 Nitin Srivastava <nitinsr@codeaurora.org> Bluetooth: Free bd_addr in avrcp getRcFeature callback

Free bd_addr received in avrcp getRcFeature callback to avoid
JNI local reference table overflow Error in AVRCP JNI.

Change-Id: I4f98adbbc23516dd2887b263e0128cdf183b2280
ni/com_android_bluetooth_avrcp.cpp
f2fab45657d6097f08b95a83eca0bf8005807599 03-Feb-2014 Nitin Srivastava <nitinsr@codeaurora.org> BT: HDP: Add NULL check in cleanupApps

Add NULL check for profile Apps data before accessing
them during cleanup.

Change-Id: Iebc6dc0399ed3d77078962b50550d3080a82644f
rc/com/android/bluetooth/hdp/HealthService.java
cdd2da9489cdfcf35ffdc622eba6f2155f6d376e 25-Sep-2013 Zhihai Xu <zhihaixu@google.com> Bluetooth: Added Shared Preferences to restore tethering preference

Added a Shared Preferences to have the tethering preference persist,
The value is stored while changing the tethering preference by user
and tethering preference will be restored based on the value(last
saved tethering preference) while starting the PAN service.
from QCOM
Change-Id: I468564a51ff17dfdf1b95a532fa429477db0da15
rc/com/android/bluetooth/pan/PanService.java
86449ac4bc7a8f4b2afeab4da420ae4f980c850a 13-Dec-2013 Hemant Gupta <hemantg@codeaurora.org> Bluetooth-OPP: Enable support to send same file multiple times

Change will add support to send same file multiple times. Otherwise,
if same file is selected to send multiple times after first transfer
succeeds queued instances of the same file got removed and it fails
to be sent.

Change-Id: Ic5b3706644a417cae2491d1df9588a22344f1711
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
rc/com/android/bluetooth/opp/BluetoothOppUtility.java
f30c02bcdcd22bbcc27c3481f371b162e49c33ef 06-Feb-2014 Hemant Gupta <hemantg@codeaurora.org> PBAP: Fix search by number issue for contacts.

Fix String outofbounds exception while searching
contacts by NUMBER Search attribute.

Change-Id: Ib82cc138c1fa17c68751eb124114e1f8c2c83324
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
07fcc0521a01be523dd625fa1ac29b4d8991c2d9 09-Feb-2014 Hemant Gupta <hemantg@codeaurora.org> Bluetooth: Map: Trim folder name in pushMessage and setPath

Trim folder name string passed from remote, before processing the
pushMessage and setPath request to do proper handling when a blank
folder name is passed from some Carkits. Without this change there
will be some IOT issues with some carkit(s) which will append a space
instead of empty string for pushing message to current folder.

Change-Id: I8b0bdfc1f837c53f0773057db27b81ae9acb279a
rc/com/android/bluetooth/map/BluetoothMapObexServer.java
145880aa83b9e88d31daad5d47f250840573824e 09-Dec-2013 Hemant Gupta <hemantg@codeaurora.org> PBAP: Compare Name and ID both for getting vcard by number

This change will add a ID comparison along with the
Name before writing the final vcard entry when we get
the list through getContactsNamesByNumber
to avoid providing the vcard having the same name but
different numbers.

Change-Id: Ie2e1567a784cd3d872495a029fce6b51a39de993
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
cf8f608b3da0f82c1a238023275836e3efd2481f 17-Feb-2014 Nitin Srivastava <nitinsr@codeaurora.org> BT: HFP: Set VR flags to false when HS disconnects

When a HS is disconnected while in VR session and then
reconnected again, VR attempt from HS fails as VR flags
mVoiceRecognitionStarted and mWaitingForVoiceRecognition
were not reset to false when HS disconnected.

Change-Id: I008f01393a5529f63cd8392401e1402a9afe70a8
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
87896dd915245016e231327332e9d2e577e64a74 14-Apr-2014 Prem Kumar <premk@google.com> Add WRITE_APN_SETTINGS permission for access to Telephony

Bug 13964670

Change-Id: Icea596a7efa6aeeafb6c6a32bd203a9654dfa9bf
ndroidManifest.xml
255407d2c34234150b09e70584adaf72175b0eea 19-Mar-2014 Zhihai Xu <zhihaixu@google.com> MHF: Disconnect audio for HS1 before disconnecting ACL.

When HS2 is connected while call is active on HS1,
disconnect audio first followed by disconnecting ACL
for HS1.
from QCOM
Change-Id: I53b6fedd47008cf0d6d65a72f744b2df4a198e34
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
4f491cb7088f918a10d39b52729233d3c98483f2 16-Jul-2013 Ganesh Ganapathi Batta <ganeshg@broadcom.com> Set profile priorities only after SDP completion

Set the profile priorities only after SDP completion.
Perform lookup and set profile priorities to ON, only for
profiles supported by bonded BT device.
CR BLTH02405767

Change-Id: I83fe6e772993b7c41c6a86f504d2b09ea38b2356

Conflicts:
src/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
e013986fbc8796db569587afa5c6b34e53d7a31b 07-Feb-2014 Hemant Gupta <hemantg@codeaurora.org> [4/4] Add Support for AVRCP Controller Feature

- Provide support for AVRCP Controller CAT 1 and CAT 2
Passthrough commands.
- Fix bug in usage of percent volume change in absolute
volume case.

Change-Id: Ie753329a96c30343d92c421c5e0113ff3e624db6
ni/com_android_bluetooth_avrcp.cpp
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/Avrcp.java
c968f020c251cdd07cc59be11e263161ff9be7d0 01-May-2014 Matthew Xie <mattx@google.com> am 97af6d96: am cc4730be: Add Intent.FLAG_RECEIVER_FOREGROUND for pairing intent broadcast

* commit '97af6d969c21b54c426264c21ed0d8e85e0bca3f':
Add Intent.FLAG_RECEIVER_FOREGROUND for pairing intent broadcast
97af6d969c21b54c426264c21ed0d8e85e0bca3f 01-May-2014 Matthew Xie <mattx@google.com> am cc4730be: Add Intent.FLAG_RECEIVER_FOREGROUND for pairing intent broadcast

* commit 'cc4730be1fcf272355368ca4a2c464d71d3f432d':
Add Intent.FLAG_RECEIVER_FOREGROUND for pairing intent broadcast
cc4730be1fcf272355368ca4a2c464d71d3f432d 01-May-2014 Matthew Xie <mattx@google.com> Add Intent.FLAG_RECEIVER_FOREGROUND for pairing intent broadcast

The pairing intents targeting apps for user interaction. The flag
should be used.
bug 13909361

Change-Id: I13f10df46549773bf416f72ca630ea8ee49fe548
rc/com/android/bluetooth/btservice/RemoteDevices.java
ebc7d6d8ff2512a1e8bc799f887716d88b671e85 07-Feb-2014 Hemant Gupta <hemantg@codeaurora.org> Bluetooth-OPP: Handle HID mouse right click event

This change will handle mouse right click event to display only
context menu with options Open and Clear. Otherwise, during HID mouse
right click two popup will be displayed context menu and Open option
while selecting context menu, option app crash is observed.

Change-Id: I8328f87f9c4bc007cd46a5567268621499e35343
rc/com/android/bluetooth/opp/BluetoothOppTransferHistory.java
e19c9bbf0157891af875c9613591801e3ec04ad2 30-Apr-2014 Zhihai Xu <zhihaixu@google.com> am 1e5ccec7: am f0362f25: am b398dad1: Merge "Improve sending web link with Bluetooth"

* commit '1e5ccec7481ef41cb31b8d50cbd3e9dd624c91f1':
Improve sending web link with Bluetooth
1e5ccec7481ef41cb31b8d50cbd3e9dd624c91f1 30-Apr-2014 Zhihai Xu <zhihaixu@google.com> am f0362f25: am b398dad1: Merge "Improve sending web link with Bluetooth"

* commit 'f0362f2538cae32d5e24afed609a813d99e33143':
Improve sending web link with Bluetooth
f0362f2538cae32d5e24afed609a813d99e33143 30-Apr-2014 Zhihai Xu <zhihaixu@google.com> am b398dad1: Merge "Improve sending web link with Bluetooth"

* commit 'b398dad1e5dbd0e4724fedbcb694cd62cba02573':
Improve sending web link with Bluetooth
b398dad1e5dbd0e4724fedbcb694cd62cba02573 30-Apr-2014 Zhihai Xu <zhihaixu@google.com> Merge "Improve sending web link with Bluetooth"
278ca5fcf7f9595521a4f722abd9b4785c70e265 08-Apr-2011 Mathias Jeppsson <mathias.jeppsson@sonyericsson.com> Improve sending web link with Bluetooth

When sending web link from Google maps app, link cannot be used by
receiver as maps app will send extra text in addition to web link.

Improve the creation of html so that only the web link is
interpreted as a link.

Code is partly copied from MessageView class in the email app.

Change-Id: Idb093cc3d5af5fa6b85649d194fa6dc0c6fdfd1e
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
d93e1487863468898b752d54b07dcd4e0661c113 18-Apr-2014 Ganesh Ganapathi Batta <ganeshg@broadcom.com> Add transport param to Connect APIs

Support for passing preferred transport for GATT connections as part of
Connect APIs

Change-Id: Ibeafb922aec954d1f2e693b422e264fbc87468f2
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
0b6cbac4955586f3417b0d485144892b00bdf6f5 30-Apr-2014 Bill Yi <byi@google.com> am e2245888: am 3f4dc8e0: Merge commit \'b8bd4924c6de7333a08294a7d20d065e7b7a6f31\' into HEAD

* commit 'e22458880544d88af446270e1d434f056bfe1cf8':
e22458880544d88af446270e1d434f056bfe1cf8 30-Apr-2014 Bill Yi <byi@google.com> am 3f4dc8e0: Merge commit \'b8bd4924c6de7333a08294a7d20d065e7b7a6f31\' into HEAD

* commit '3f4dc8e00f57579f5b57726929f1d34260a77cd1':
5d56b57b6fac07125f5462a6ed3dd3b1a546541b 15-Mar-2014 Sunny Kapdi <sunnyk@codeaurora.org> MHF: Start DIALING_OUT_TIMEOUT for correct device

When processing Dial request, start DIALING_OUT_TIMEOUT
timer for correct matching device.
Also add null check for device retrieved from
getDeviceForMessage()

Change-Id: Id9946c6b91ca1b23a24dfe408a81db25b9dfb86a
CRs-Fixed: 612278
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
1b1780bd64223ee4cc4103b75316ccc0745cbcc5 15-Mar-2014 Sunny Kapdi <sunnyk@codeaurora.org> MHF: Broadcast connected state for HS

- Since telephony doesn't store list of connected HS, BT needs
to broadcast connected state for an already connected HS,
when other HS disconnects. This will notify telephony that
even though one HS is disconnected, but still there is one
other connected HS. This fixes call routing issue to BT HS
from phone UI.

- Set mActiveScoDevice to null when HS disconnects while
it has SCO connected for ongoing call.

Change-Id: I91aba22844938b61afc0bac52b5b6de95354f491
CRs-Fixed: 619841
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
69d4ca45a25e86823fbdb754ca6a3995f8131d59 15-Mar-2014 Nitin Srivastava <nitinsr@codeaurora.org> Multi HF support

1. Added support for Multi HF connections
in Bluetooth application.
2. All connection transition states for
2nd HS onwards is handled in new state-
MultiHFPending.
3. The changes are done to handle proper
state transition for all connected HS.

Change-Id: I033ae57943e50273f9d3cac4c5f8d1624cb9ee09
ni/com_android_bluetooth_hfp.cpp
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/hfp/AtPhonebook.java
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
139339cf5dc27fc4ad154906d536ab12b02c5ae3 11-Mar-2014 Nitin Srivastava <nitinsr@codeaurora.org> Bluetooth: Free bd_addr in avrcp getRcFeature callback

Free bd_addr received in avrcp getRcFeature callback to avoid
JNI local reference table overflow Error in AVRCP JNI.

Change-Id: I4f98adbbc23516dd2887b263e0128cdf183b2280
ni/com_android_bluetooth_avrcp.cpp
5f1aaa0fc4fc7e94c4f67de35a35ec6ca5ad9ec9 03-Feb-2014 Nitin Srivastava <nitinsr@codeaurora.org> BT: HDP: Add NULL check in cleanupApps

Add NULL check for profile Apps data before accessing
them during cleanup.

Change-Id: Iebc6dc0399ed3d77078962b50550d3080a82644f
rc/com/android/bluetooth/hdp/HealthService.java
3f4dc8e00f57579f5b57726929f1d34260a77cd1 29-Apr-2014 Bill Yi <byi@google.com> Merge commit 'b8bd4924c6de7333a08294a7d20d065e7b7a6f31' into HEAD
e40925fc889d7f9dfc2a12c8165086cc7c312cc6 25-Sep-2013 Zhihai Xu <zhihaixu@google.com> Bluetooth: Added Shared Preferences to restore tethering preference

Added a Shared Preferences to have the tethering preference persist,
The value is stored while changing the tethering preference by user
and tethering preference will be restored based on the value(last
saved tethering preference) while starting the PAN service.
from QCOM
Change-Id: I468564a51ff17dfdf1b95a532fa429477db0da15
rc/com/android/bluetooth/pan/PanService.java
ca2a13ee25488f913766081e42daa2dce85d75aa 13-Dec-2013 Hemant Gupta <hemantg@codeaurora.org> Bluetooth-OPP: Enable support to send same file multiple times

Change will add support to send same file multiple times. Otherwise,
if same file is selected to send multiple times after first transfer
succeeds queued instances of the same file got removed and it fails
to be sent.

Change-Id: Ic5b3706644a417cae2491d1df9588a22344f1711
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
rc/com/android/bluetooth/opp/BluetoothOppUtility.java
90d9ea96c0b0f3209dc03667e21d14a13ca1f614 06-Feb-2014 Hemant Gupta <hemantg@codeaurora.org> PBAP: Fix search by number issue for contacts.

Fix String outofbounds exception while searching
contacts by NUMBER Search attribute.

Change-Id: Ib82cc138c1fa17c68751eb124114e1f8c2c83324
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
4ffed8e8fbde75ab5151cce325acf2a636e09c8f 09-Feb-2014 Hemant Gupta <hemantg@codeaurora.org> Bluetooth: Map: Trim folder name in pushMessage and setPath

Trim folder name string passed from remote, before processing the
pushMessage and setPath request to do proper handling when a blank
folder name is passed from some Carkits. Without this change there
will be some IOT issues with some carkit(s) which will append a space
instead of empty string for pushing message to current folder.

Change-Id: I8b0bdfc1f837c53f0773057db27b81ae9acb279a
rc/com/android/bluetooth/map/BluetoothMapObexServer.java
130969d18eadbd94361fe95bf16b8131cdea6168 09-Dec-2013 Hemant Gupta <hemantg@codeaurora.org> PBAP: Compare Name and ID both for getting vcard by number

This change will add a ID comparison along with the
Name before writing the final vcard entry when we get
the list through getContactsNamesByNumber
to avoid providing the vcard having the same name but
different numbers.

Change-Id: Ie2e1567a784cd3d872495a029fce6b51a39de993
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
ad04e50fbcfebfdaa39537e08fa728f71eb8ad5a 28-Apr-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ic34ecbbea0212dc8fe8bf1718ea02d8178c35033
Auto-generated-cl: translation import
es/values-de/strings.xml
849da7cd88ec65cb153e9d81d3e2ea78418ba181 17-Feb-2014 Nitin Srivastava <nitinsr@codeaurora.org> BT: HFP: Set VR flags to false when HS disconnects

When a HS is disconnected while in VR session and then
reconnected again, VR attempt from HS fails as VR flags
mVoiceRecognitionStarted and mWaitingForVoiceRecognition
were not reset to false when HS disconnected.

Change-Id: I008f01393a5529f63cd8392401e1402a9afe70a8
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
913fd4253f52af47db45614b22ca1f34ba013d93 23-Apr-2014 Baligh Uddin <baligh@google.com> am 69780cd4: (-s ours) am 7b137020: (-s ours) Import translations. DO NOT MERGE

* commit '69780cd47476ddc3d100a36c37a3faa169d99a94':
Import translations. DO NOT MERGE
69780cd47476ddc3d100a36c37a3faa169d99a94 23-Apr-2014 Baligh Uddin <baligh@google.com> am 7b137020: (-s ours) Import translations. DO NOT MERGE

* commit '7b137020001f4f2d7f060c7ba10f472ccae47e73':
Import translations. DO NOT MERGE
7b137020001f4f2d7f060c7ba10f472ccae47e73 23-Apr-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I8a359674e94db889d4277025d2d0382afd837bb7
Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-el/strings.xml
es/values-el/test_strings.xml
es/values-es/strings.xml
es/values-th/strings.xml
es/values-th/test_strings.xml
333fff8f67b139bbdd45f29db1d639bda8c5e4fc 21-Apr-2014 Ying Wang <wangying@google.com> am be511485: am f7437137: Merge "Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."

* commit 'be5114854d59ad5370fd67fce46d7de451ad9bc7':
Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
be5114854d59ad5370fd67fce46d7de451ad9bc7 19-Apr-2014 Ying Wang <wangying@google.com> am f7437137: Merge "Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."

* commit 'f74371375f923622e501f32b2b450dedb21633db':
Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
f74371375f923622e501f32b2b450dedb21633db 19-Apr-2014 Ying Wang <wangying@google.com> Merge "Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
24f5be0f391af65bbda92ca81745265f3452d2a2 18-Apr-2014 Ying Wang <wangying@google.com> Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.

Change-Id: I09136893fad68b59ffd5f081239b664a447c538d
ndroid.mk
cd970809fb17f6ad63c22f8ef3d55732ac94f6d2 18-Apr-2014 Ying Wang <wangying@google.com> Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.

Change-Id: I09136893fad68b59ffd5f081239b664a447c538d
ndroid.mk
8808a0da77efae56d460398d90f44c5541051d5f 16-Apr-2014 Zhihai Xu <zhihaixu@google.com> Merge "LE: Add API to configure MTU for a given connection (4/4) this patch is from broadcom(andre) bug:13571470 Change-Id: I4faf13f3daa535337b721a8b48e92334ed0ecb7c" into klp-wireless-dev
9063719ccd0a0b6fc6485393f88336124d399ef6 25-Mar-2014 Zhihai Xu <zhihaixu@google.com> LE: Add API to configure MTU for a given connection (4/4)
this patch is from broadcom(andre)
bug:13571470
Change-Id: I4faf13f3daa535337b721a8b48e92334ed0ecb7c
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
03ddfab6feec038f92325290d8d9bba5454753e5 16-Apr-2014 Ariel Gertzenstein <agertzen@google.com> am cfdcd9a9: (-s ours) am dff6da3d: DO NOT MERGE Update PAN JNI code to match updated interface definition.

* commit 'cfdcd9a945fd69d78dc4f6dc77dc058f4d1b5fc4':
DO NOT MERGE Update PAN JNI code to match updated interface definition.
cfdcd9a945fd69d78dc4f6dc77dc058f4d1b5fc4 16-Apr-2014 Ariel Gertzenstein <agertzen@google.com> am dff6da3d: DO NOT MERGE Update PAN JNI code to match updated interface definition.

* commit 'dff6da3d0a5dc0b727bdeb2b6c764052123c7fd4':
DO NOT MERGE Update PAN JNI code to match updated interface definition.
b6c41523a61e95601905d839ad032d9238afb7ea 16-Apr-2014 Ariel Gertzenstein <agertzen@google.com> am 401e9bd3: (-s ours) am 307c977d: DO NOT MERGE Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.

* commit '401e9bd33599a14059d5333c16497483e41bd20b':
DO NOT MERGE Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.
dff6da3d0a5dc0b727bdeb2b6c764052123c7fd4 01-Feb-2014 Ariel Gertzenstein <agertzen@google.com> DO NOT MERGE Update PAN JNI code to match updated interface definition.

This also fixes some weird internal reordering of arguments. All
of the implementations should match the interfaces now.

http://b/12853951

Change-Id: I019da4892204dd92ebf203e77bdb23af96c57697
ni/com_android_bluetooth_pan.cpp
401e9bd33599a14059d5333c16497483e41bd20b 16-Apr-2014 Ariel Gertzenstein <agertzen@google.com> am 307c977d: DO NOT MERGE Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.

* commit '307c977d7381ab2d6c6b8f2c1fdbfe756547ad1b':
DO NOT MERGE Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.
307c977d7381ab2d6c6b8f2c1fdbfe756547ad1b 29-Jan-2014 Ariel Gertzenstein <agertzen@google.com> DO NOT MERGE Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.

http://b/12788418

Change-Id: I7cc43db047457eb6a4ac501770a714eef0ed6422
rc/com/android/bluetooth/pan/PanService.java
e4be9759811b7aac31d92d982b3b5c65be716858 14-Apr-2014 Prem Kumar <premk@google.com> Add WRITE_APN_SETTINGS permission for access to Telephony

Bug 13964670

Change-Id: Icea596a7efa6aeeafb6c6a32bd203a9654dfa9bf
ndroidManifest.xml
a904f04e5838c3d7e5b5a17b89febf7c5a4dc913 14-Apr-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I80a14d2f96f7c5449302de178620b3701a0fdd01
Auto-generated-cl: translation import
es/values-th/strings.xml
es/values-th/test_strings.xml
0a638a8d5e3083ae6d679ac864ae0c05ab7fa7e9 12-Apr-2014 Alexandra Gherghina <alexgherghina@google.com> Merge "Revert "Mark Bluetooth as required for all profiles""
16fab07b08751a344b74bde67dd86418f4456fe0 11-Apr-2014 Alexandra Gherghina <alexgherghina@google.com> Revert "Mark Bluetooth as required for all profiles"

This reverts commit 7ed421e6fbd032fed75f27a97984fd2be450c6ca.

We've switched to a whitelist approach.

Change-Id: Ibd2719c44bfa976ba8773ba3066ddca92f7eda8b
ndroidManifest.xml
55693a982ad88c56e3a2ab89750419c53c6d7628 10-Apr-2014 zzy <zhenye@broadcom.com> am 0de40c51: (-s ours) am 93bbeea2: DO NOT MERGE: Exit bt process after cleanup

* commit '0de40c51768ecb06d628b6ec1d731ffaaa4af662':
DO NOT MERGE: Exit bt process after cleanup
0de40c51768ecb06d628b6ec1d731ffaaa4af662 10-Apr-2014 zzy <zhenye@broadcom.com> am 93bbeea2: DO NOT MERGE: Exit bt process after cleanup

* commit '93bbeea23b6e974554eba6337d758f70c3314d06':
DO NOT MERGE: Exit bt process after cleanup
93bbeea23b6e974554eba6337d758f70c3314d06 04-Mar-2014 zzy <zhenye@broadcom.com> DO NOT MERGE: Exit bt process after cleanup

Added code to exit bt process and avoid android process caching.
The fix also gives end user a chance to recover a bad state bt process by
simply turning off/on the bluetooth. Since the process is not recycled,
the kernel frees up all leftover fd and memory and gives bt process a fresh start every time.
Addresses b/13912278

Change-Id: I616345da70bb60f1aeaab151a6bf6f793168a829
rc/com/android/bluetooth/btservice/AdapterService.java
e296684eab2bf622ff27cb1b3cd3008e919dfe30 31-Mar-2014 Christian Hanner <christian3.hanner@sonymobile.com> Use round() instead of ceil() in calculation of a2dp vol slider position

The avrcp MESSAGE_VOLUME_CHANGED requests volumes in the range 0-127. In
convertToAudioStreamVolume() this value is scaled to a (typically much
smaller, e.g. 0-15) integer value representing the volume slider step to
be presented in the UI. Depending on the resolution in the volume
requests from the a2dp device and the resolution of the UI volume
slider, some of the requested volumes might be mapped onto the same
UI slider positions. If ceil() is exchanged for round() in
convertToAudioStreamVolume() the problem with double mapped volumes
vanishes in most realistic cases.

Change-Id: I89d9ac4b8c330fd4fd2a02984bd628961f2cb035
rc/com/android/bluetooth/a2dp/Avrcp.java
a785b23c7756a65d5836787251f04e521800157c 08-Apr-2014 Matthew Xie <mattx@google.com> am 7d599189: am b9c0706b: Merge "Bluetooth: Make Bonded device list operations are synchronous"

* commit '7d599189869be67ba2b74b6e0729be74ffbe0b74':
Bluetooth: Make Bonded device list operations are synchronous
e187e2798dc2551068c8a0dd38caaa5a7cbf862b 08-Apr-2014 Matthew Xie <mattx@google.com> am 010b179c: am 5aace9b6: Merge "MAP: Fix MMS pushMessage from OUTBOX to SENT folder"

* commit '010b179cdad1ecc9940b771698d0af90518596d1':
MAP: Fix MMS pushMessage from OUTBOX to SENT folder
7d599189869be67ba2b74b6e0729be74ffbe0b74 08-Apr-2014 Matthew Xie <mattx@google.com> am b9c0706b: Merge "Bluetooth: Make Bonded device list operations are synchronous"

* commit 'b9c0706b00f64a59911a5ac63e3f609dabebc284':
Bluetooth: Make Bonded device list operations are synchronous
010b179cdad1ecc9940b771698d0af90518596d1 08-Apr-2014 Matthew Xie <mattx@google.com> am 5aace9b6: Merge "MAP: Fix MMS pushMessage from OUTBOX to SENT folder"

* commit '5aace9b695c57beffb53c16f4426319baeb79900':
MAP: Fix MMS pushMessage from OUTBOX to SENT folder
b9c0706b00f64a59911a5ac63e3f609dabebc284 08-Apr-2014 Matthew Xie <mattx@google.com> Merge "Bluetooth: Make Bonded device list operations are synchronous"
5aace9b695c57beffb53c16f4426319baeb79900 08-Apr-2014 Matthew Xie <mattx@google.com> Merge "MAP: Fix MMS pushMessage from OUTBOX to SENT folder"
80ba6a98ca4b41ac28fb940972c96d10d7b5351e 07-Apr-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I9804306952fb31bc4b954e5794da9a186038a50c
Auto-generated-cl: translation import
es/values-es/strings.xml
cfaffa85e4a5388f3591bb17f88fc7768676eae2 11-Mar-2014 Andres Morales <anmorales@google.com> Making Bluetooth OPP file transfer intent generic

In the process of adding Wifi as a transport for Beam,
the only consumer of this code as of yet. Need to decouple
the file transfer events from the bluetooth stack to be able
to cleanly reuse them in the wifi code.

Change-Id: I9dafe4f6756bf429b4770826c46d41330a334493
ndroidManifest.xml
es/values/strings.xml
rc/com/android/bluetooth/opp/Constants.java
ests/AndroidManifest.xml
28eff1a17b1e60f985f841faadde6420bf0d001f 12-Mar-2014 Wei Wang <weiwa@google.com> DO NOT MERGE: Add status callback for start/stop advertising.
cherrypick from master.

Change-Id: I666969442b756ce461ff64eff0d09f5283431fb3
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
3ade86ccb88467d59f3a44cc61a7e170d7c8095c 01-Apr-2014 Alexandra Gherghina <alexgherghina@google.com> Merge "Mark Bluetooth as required for all profiles"
7ed421e6fbd032fed75f27a97984fd2be450c6ca 01-Apr-2014 Alexandra Gherghina <alexgherghina@google.com> Mark Bluetooth as required for all profiles

Change-Id: I6c5ccac860a1d3f5874963760d849552e0b7ff74
ndroidManifest.xml
1498ea75bf38641b6f1938e57d7e550b33eecb7a 31-Mar-2014 Andre Eisenbach <andre@broadcom.com> am a207e911: am 66275876: LE: Add API to configure MTU for a given connection (4/4)

* commit 'a207e911bf5bab8c1a6c3e3e059bca090b01aec2':
LE: Add API to configure MTU for a given connection (4/4)
a207e911bf5bab8c1a6c3e3e059bca090b01aec2 31-Mar-2014 Andre Eisenbach <andre@broadcom.com> am 66275876: LE: Add API to configure MTU for a given connection (4/4)

* commit '662758761424473da90573de5fed1b686ce9ba0e':
LE: Add API to configure MTU for a given connection (4/4)
8bde40eb58d7a6526a2e59dd375bf62bb9eb006b 31-Mar-2014 Matthew Xie <mattx@google.com> am eec38f41: am 2ce3e327: Merge "MAP: Handle MessageListing empty folder name if set to current path."

* commit 'eec38f41c44410c35e1c7b2f7de544bd85b55736':
MAP: Handle MessageListing empty folder name if set to current path.
eec38f41c44410c35e1c7b2f7de544bd85b55736 31-Mar-2014 Matthew Xie <mattx@google.com> am 2ce3e327: Merge "MAP: Handle MessageListing empty folder name if set to current path."

* commit '2ce3e327bcebb56be8a286da9c8a7c3974f36b64':
MAP: Handle MessageListing empty folder name if set to current path.
2ce3e327bcebb56be8a286da9c8a7c3974f36b64 31-Mar-2014 Matthew Xie <mattx@google.com> Merge "MAP: Handle MessageListing empty folder name if set to current path."
b529d1fedc05d16542e5106746ab653465ee8e30 26-Mar-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ifb3c7c414db0a63a27fdd617b54aa32b60ff3f4a
Auto-generated-cl: translation import
es/values-am/strings.xml
662758761424473da90573de5fed1b686ce9ba0e 25-Mar-2014 Andre Eisenbach <andre@broadcom.com> LE: Add API to configure MTU for a given connection (4/4)

bug:13571470
Change-Id: I4faf13f3daa535337b721a8b48e92334ed0ecb7c
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
7903540c80a44140966ad8a4c9e30907494e2e18 20-Mar-2014 Wei Wang <weiwa@google.com> am 9c628cea: (-s ours) am 93cb7b67: am e3c4ef80: am 24dce607: DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master to fix b/13289050

* commit '9c628cea53773c6290b665b8f427575310a010dc':
DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master to fix b/13289050
baf4527cb6bb5e0f3f17763f0b51b9acdd2de96b 20-Mar-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
b8bd4924c6de7333a08294a7d20d065e7b7a6f31 20-Mar-2014 Wei Wang <weiwa@google.com> am e3c4ef80: am 24dce607: DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master to fix b/13289050

* commit 'e3c4ef80690ff1389367806fcbafaaf019d0f5ca':
DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master to fix b/13289050
9c628cea53773c6290b665b8f427575310a010dc 20-Mar-2014 Wei Wang <weiwa@google.com> am 93cb7b67: am e3c4ef80: am 24dce607: DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master to fix b/13289050

* commit '93cb7b670a886fb12150c683469ad48b0e55176d':
DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master to fix b/13289050
93cb7b670a886fb12150c683469ad48b0e55176d 20-Mar-2014 Wei Wang <weiwa@google.com> am e3c4ef80: am 24dce607: DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master to fix b/13289050

* commit 'e3c4ef80690ff1389367806fcbafaaf019d0f5ca':
DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master to fix b/13289050
e3c4ef80690ff1389367806fcbafaaf019d0f5ca 20-Mar-2014 Wei Wang <weiwa@google.com> am 24dce607: DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master to fix b/13289050

* commit '24dce60783d85fbf49f550203a383b2f4a171a52':
DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master to fix b/13289050
24dce60783d85fbf49f550203a383b2f4a171a52 12-Mar-2014 Wei Wang <weiwa@google.com> DO NOT MERGE: Add status callback for start/stop advertising.
cherrypick from master to fix b/13289050

Change-Id: I666969442b756ce461ff64eff0d09f5283431fb3
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
f4324a2b3ea358056504707435b7f032abf844eb 19-Mar-2014 Wei Wang <weiwa@google.com> Merge "Add status callback for start/stop advertising. Fixes b/13418851, b/13289050."
0312f2b5c02e472eca2a91c93d465f81a3c6fc3d 19-Mar-2014 Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com> HFP: Fix missing OK for AT+CLCC in virtual call

When AT+CLCC is received from HF while we're in virtual call mode there
is only non-zero index call sent without final zero index call. This
makes AT command response incomplete since no OK is sent.

From HFP specification, section 4.31.1:
"The AG shall always send OK response to HF."

Change-Id: I2d759bd3d65f2adb9a364d40ffe23d6197c6375b
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
b1d2302f8e929ea87d46cc15f314127a4389d917 19-Mar-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I82bf5f1f043ed5484f3efb384ebd98b64b0e9880
Auto-generated-cl: translation import
es/values-el/strings.xml
es/values-el/test_strings.xml
c3b5ffdc43d7370d5e18a25db901f7b9e2dc59d2 12-Mar-2014 Wei Wang <weiwa@google.com> Add status callback for start/stop advertising.
Fixes b/13418851, b/13289050.

Change-Id: I666969442b756ce461ff64eff0d09f5283431fb3
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
045c8cb715d86f19f8f5c1e6ddb73d3fdfac6a6a 17-Mar-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I357e14ffa4d4c61ec48e6d50707eca1f38956e4d
Auto-generated-cl: translation import
es/values-am/strings.xml
8dcfd47f79ffe87408f5579baeaeab0b844684d2 14-Mar-2014 Zhihai Xu <zhihaixu@google.com> am b118009a: (-s ours) am f2601dc0: am 5bae8a40: am 969f4932: Merge "DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power." into klp-dev

* commit 'b118009afe838803b9081eee03606b19aed3cfda':
DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power.
b118009afe838803b9081eee03606b19aed3cfda 14-Mar-2014 Zhihai Xu <zhihaixu@google.com> am f2601dc0: am 5bae8a40: am 969f4932: Merge "DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power." into klp-dev

* commit 'f2601dc0e60adc8e83fd3a3c2b71287218b9291e':
DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power.
f2601dc0e60adc8e83fd3a3c2b71287218b9291e 14-Mar-2014 Zhihai Xu <zhihaixu@google.com> am 5bae8a40: am 969f4932: Merge "DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power." into klp-dev

* commit '5bae8a40e40e00b84750186309b6f30036c20186':
DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power.
14b5e0d58b96d48db7dd5decee1efd0a69084fcb 14-Mar-2014 Zhihai Xu <zhihaixu@google.com> am 5bae8a40: am 969f4932: Merge "DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power." into klp-dev

* commit '5bae8a40e40e00b84750186309b6f30036c20186':
DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power.
5bae8a40e40e00b84750186309b6f30036c20186 13-Mar-2014 Zhihai Xu <zhihaixu@google.com> am 969f4932: Merge "DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power." into klp-dev

* commit '969f49320925ad968eabf183fd0bbd7d77e7fd5b':
DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power.
969f49320925ad968eabf183fd0bbd7d77e7fd5b 13-Mar-2014 Zhihai Xu <zhihaixu@google.com> Merge "DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power." into klp-dev
02d1f43ae539c83aa74cde5cb95490fb0899251b 12-Mar-2014 Wei Wang <weiwa@google.com> am b48f5faa: (-s ours) am 854fcfc6: am 4474fd6b: am b15c6797: Merge "DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/13226130." into klp-dev

* commit 'b48f5faaa93f52e6ebc6c1d8ccd72df60655c634':
DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/13226130.
8da1525fdd92ce6b0fd798658dd81ff7cc533255 12-Mar-2014 kschulz <k.schulz@samsung.com> am f40c752d: (-s ours) am 2fd30a17: am b140b007: am 6d4c5c8b: DO NOT MERGE MAP: fixed missing filtering on Priority

* commit 'f40c752de8e756b36b88ddff873b1e52d514b38c':
DO NOT MERGE MAP: fixed missing filtering on Priority
a6aa84456bdf4c6e2f6ad0829bb31ed2118ab1bf 12-Mar-2014 Zhihai Xu <zhihaixu@google.com> am 14bbc001: (-s ours) am 40627b7c: am 8872c350: am d3195daf: DO NOT MERGE update play status based on A2dp audio state from stack.

* commit '14bbc0010192453bf7c51aea93e3c25f112d5b54':
DO NOT MERGE update play status based on A2dp audio state from stack.
b30d17d04eabaa770ec174eec0663fe7df3db910 11-Mar-2014 Matthew Xie <mattx@google.com> am 5288c2df: Merge "Update PAN JNI code to match updated interface definition."

* commit '5288c2df62bb54299a5daaf057eaf16ea6405104':
Update PAN JNI code to match updated interface definition.
4a272ffb0148ba02d1f83ec103104a5e9043a99c 11-Mar-2014 Matthew Xie <mattx@google.com> am 422d5b01: Merge "Avoid race condition that gets PanService stuck in STATE_DISCONNECTED."

* commit '422d5b0126fb072a657bb9bd268251bc1cb6fb6e':
Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.
b48f5faaa93f52e6ebc6c1d8ccd72df60655c634 11-Mar-2014 Wei Wang <weiwa@google.com> am 854fcfc6: am 4474fd6b: am b15c6797: Merge "DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/13226130." into klp-dev

* commit '854fcfc64f270ab928b1848f46b139174f2c83db':
DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/13226130.
f40c752de8e756b36b88ddff873b1e52d514b38c 11-Mar-2014 kschulz <k.schulz@samsung.com> am 2fd30a17: am b140b007: am 6d4c5c8b: DO NOT MERGE MAP: fixed missing filtering on Priority

* commit '2fd30a1709bcc1d5de8c33827a8c93a92e41cabf':
DO NOT MERGE MAP: fixed missing filtering on Priority
14bbc0010192453bf7c51aea93e3c25f112d5b54 11-Mar-2014 Zhihai Xu <zhihaixu@google.com> am 40627b7c: am 8872c350: am d3195daf: DO NOT MERGE update play status based on A2dp audio state from stack.

* commit '40627b7cd80a9acfe2cbd6f86dc3599f69380608':
DO NOT MERGE update play status based on A2dp audio state from stack.
854fcfc64f270ab928b1848f46b139174f2c83db 11-Mar-2014 Wei Wang <weiwa@google.com> am 4474fd6b: am b15c6797: Merge "DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/13226130." into klp-dev

* commit '4474fd6bd644cdc0f65d69db92ef203d211eefe5':
DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/13226130.
2fd30a1709bcc1d5de8c33827a8c93a92e41cabf 11-Mar-2014 kschulz <k.schulz@samsung.com> am b140b007: am 6d4c5c8b: DO NOT MERGE MAP: fixed missing filtering on Priority

* commit 'b140b007f98f38b1365c26af2472d1ed5b8a46ee':
DO NOT MERGE MAP: fixed missing filtering on Priority
40627b7cd80a9acfe2cbd6f86dc3599f69380608 11-Mar-2014 Zhihai Xu <zhihaixu@google.com> am 8872c350: am d3195daf: DO NOT MERGE update play status based on A2dp audio state from stack.

* commit '8872c350993db08bf1c58ba39a94087fc2df16b1':
DO NOT MERGE update play status based on A2dp audio state from stack.
f89cb15152c4d19db35462583d79eda669c0c87d 11-Mar-2014 Matthew Xie <mattx@google.com> am 27385b9b: Merge "PBAP: Remove initialisation of Missed calls number"

* commit '27385b9b93a06862fed92f7260416276dbbbfa66':
PBAP: Remove initialisation of Missed calls number
cf295c3744f4ec77bb0b1fad1c6558ee5ce7313f 11-Mar-2014 Matthew Xie <mattx@google.com> am 429460a8: Merge "OPP: Handle intent receiver leak for BT TURN OFF."

* commit '429460a8ec5a1e0a7dc011acb80d3826b01b1936':
OPP: Handle intent receiver leak for BT TURN OFF.
7718f33abcc44702f234ce5cdc87e8040812a0df 11-Mar-2014 Matthew Xie <mattx@google.com> am 4a57bce1: Merge "MAP: Set Empty name or address for unknown values in GetMessageListing."

* commit '4a57bce1779e7dcd502dcbb64e7e121a700ba258':
MAP: Set Empty name or address for unknown values in GetMessageListing.
1b5a93a868272990d0206875f54ba150e6e7c08b 11-Mar-2014 Matthew Xie <mattx@google.com> am 77b9e56b: Merge "Bluetooth: Update Signal strength"

* commit '77b9e56ba1dc3eadf39c46b470552031383e6786':
Bluetooth: Update Signal strength
d20c65eae3a6b9eb7439ed7450c9c9123bbcd1e1 10-Mar-2014 Wei Wang <weiwa@google.com> am 4474fd6b: am b15c6797: Merge "DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/13226130." into klp-dev

* commit '4474fd6bd644cdc0f65d69db92ef203d211eefe5':
DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/13226130.
4474fd6bd644cdc0f65d69db92ef203d211eefe5 10-Mar-2014 Wei Wang <weiwa@google.com> am b15c6797: Merge "DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/13226130." into klp-dev

* commit 'b15c6797eeba0a2685cd8375d5e509cfd8bab098':
DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/13226130.
b15c6797eeba0a2685cd8375d5e509cfd8bab098 10-Mar-2014 Wei Wang <weiwa@google.com> Merge "DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/13226130." into klp-dev
6024e17f1e9cc9c03f40347b6677d5006f63c183 10-Mar-2014 kschulz <k.schulz@samsung.com> am b140b007: am 6d4c5c8b: DO NOT MERGE MAP: fixed missing filtering on Priority

* commit 'b140b007f98f38b1365c26af2472d1ed5b8a46ee':
DO NOT MERGE MAP: fixed missing filtering on Priority
bda98633f8453ba9e8f96a06c8b724f6d662679b 10-Mar-2014 Zhihai Xu <zhihaixu@google.com> am 8872c350: am d3195daf: DO NOT MERGE update play status based on A2dp audio state from stack.

* commit '8872c350993db08bf1c58ba39a94087fc2df16b1':
DO NOT MERGE update play status based on A2dp audio state from stack.
09f512f5694cfc0ddc49f6e6953e74df89fcf60b 10-Mar-2014 Matthew Xie <mattx@google.com> am 0989aee4: am 5288c2df: Merge "Update PAN JNI code to match updated interface definition."

* commit '0989aee4c13f67462d6e70aabc542d74be5eb908':
Update PAN JNI code to match updated interface definition.
569452aa91d43eaabe120f6de5bf8d613c574e3a 10-Mar-2014 Matthew Xie <mattx@google.com> am e7668dda: am 422d5b01: Merge "Avoid race condition that gets PanService stuck in STATE_DISCONNECTED."

* commit 'e7668dda0cd1f16e4161e6f0a64c685efc1ed25d':
Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.
0989aee4c13f67462d6e70aabc542d74be5eb908 10-Mar-2014 Matthew Xie <mattx@google.com> am 5288c2df: Merge "Update PAN JNI code to match updated interface definition."

* commit '5288c2df62bb54299a5daaf057eaf16ea6405104':
Update PAN JNI code to match updated interface definition.
e7668dda0cd1f16e4161e6f0a64c685efc1ed25d 10-Mar-2014 Matthew Xie <mattx@google.com> am 422d5b01: Merge "Avoid race condition that gets PanService stuck in STATE_DISCONNECTED."

* commit '422d5b0126fb072a657bb9bd268251bc1cb6fb6e':
Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.
5288c2df62bb54299a5daaf057eaf16ea6405104 10-Mar-2014 Matthew Xie <mattx@google.com> Merge "Update PAN JNI code to match updated interface definition."
422d5b0126fb072a657bb9bd268251bc1cb6fb6e 10-Mar-2014 Matthew Xie <mattx@google.com> Merge "Avoid race condition that gets PanService stuck in STATE_DISCONNECTED."
b140b007f98f38b1365c26af2472d1ed5b8a46ee 09-Mar-2014 kschulz <k.schulz@samsung.com> am 6d4c5c8b: DO NOT MERGE MAP: fixed missing filtering on Priority

* commit '6d4c5c8befa3e585271ed4db770dd6990827d1f0':
DO NOT MERGE MAP: fixed missing filtering on Priority
8872c350993db08bf1c58ba39a94087fc2df16b1 09-Mar-2014 Zhihai Xu <zhihaixu@google.com> am d3195daf: DO NOT MERGE update play status based on A2dp audio state from stack.

* commit 'd3195daf68329036df6a01331b466844b5cb29de':
DO NOT MERGE update play status based on A2dp audio state from stack.
0dee1ec5bbaee99fbb53546c0b2487508e83c405 08-Mar-2014 Wei Wang <weiwa@google.com> am 35258ea5: (-s ours) am e6768bab: am b285350d: (-s ours) am b9703de9: Merge "DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change." into klp-dev

* commit '35258ea5610c97881ff1223e3a0a34962219b3cc':
DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change.
98dde68aa7cf3b63683fa5cbd70b11623a29a90f 27-Nov-2013 Zhihai Xu <zhihaixu@google.com> DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power.

bug:11138488
Change-Id: Ie7d8903cc917aee51711fa47f275863e4046f3d8
rc/com/android/bluetooth/map/BluetoothMapObexServer.java
rc/com/android/bluetooth/map/BluetoothMapService.java
rc/com/android/bluetooth/map/BluetoothMnsObexClient.java
6d4c5c8befa3e585271ed4db770dd6990827d1f0 11-Oct-2013 kschulz <k.schulz@samsung.com> DO NOT MERGE MAP: fixed missing filtering on Priority

FilterPriority was ignored in the code as SMS does not have priority.
This fixes the support for the priority filter for sms + mms.
NOTICE: sms messages does not have priority and hence will return
an empty messagelisting if the client requests a list with priority
filter set til high-pri only.

Bug: 11168636
Change-Id: If028e47850323d20d1e9a23bc947782ae8da1df0
rc/com/android/bluetooth/map/BluetoothMapContent.java
d3195daf68329036df6a01331b466844b5cb29de 08-Jan-2014 Zhihai Xu <zhihaixu@google.com> DO NOT MERGE update play status based on A2dp audio state from stack.

this is to work around the problem:some video/audio player didn't
update the play status by calling setPlaybackState.
The headset(HBS730) register the play status update on the phone.
It will depend the play status reported from the phone to send
play or pause command.

bug:11325212
Change-Id: I7fde5960edd4a5b3474fa17456aacd5b4b432d4d
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/a2dp/Avrcp.java
ca9674c0f223a5bab5c6750594fd7ee76811771f 08-Mar-2014 Wei Wang <weiwa@google.com> am b285350d: am b9703de9: Merge "DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change." into klp-dev

* commit 'b285350d6580a118940a0f7d62857a199e362283':
DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change.
35258ea5610c97881ff1223e3a0a34962219b3cc 08-Mar-2014 Wei Wang <weiwa@google.com> am e6768bab: am b285350d: (-s ours) am b9703de9: Merge "DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change." into klp-dev

* commit 'e6768bab0f6375c2fc8c438630dd59b63fe8f922':
DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change.
e6768bab0f6375c2fc8c438630dd59b63fe8f922 08-Mar-2014 Wei Wang <weiwa@google.com> am b285350d: (-s ours) am b9703de9: Merge "DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change." into klp-dev

* commit 'b285350d6580a118940a0f7d62857a199e362283':
DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change.
b285350d6580a118940a0f7d62857a199e362283 08-Mar-2014 Wei Wang <weiwa@google.com> am b9703de9: Merge "DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change." into klp-dev

* commit 'b9703de9f4892341e2a1f5ea1908aed19018569f':
DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change.
3f77ee6ab5af60c92a5672e612ecf3ac51b98600 28-Feb-2014 Wei Wang <weiwa@google.com> DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/13226130.

Cherry picking ble advertising changes from master to KLP MR2.
b/13137996

Change-Id: Iba48f4757a6b54911277900b875d83eaa81488b7
ndroidManifest.xml
b9703de9f4892341e2a1f5ea1908aed19018569f 08-Mar-2014 Wei Wang <weiwa@google.com> Merge "DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change." into klp-dev
b8183f71183a43c6917e91b10139c5a2daec4a04 07-Mar-2014 Mike J. Chen <mjchen@google.com> am a1d2ed87: am e3805c61: Merge "Add handshake callback support" into klp-modular-dev

* commit 'a1d2ed879c917f47d11c9462e4d9e35c9a0f68f2':
Add handshake callback support
a1d2ed879c917f47d11c9462e4d9e35c9a0f68f2 07-Mar-2014 Mike J. Chen <mjchen@google.com> am e3805c61: Merge "Add handshake callback support" into klp-modular-dev

* commit 'e3805c6144038207bc72654bd250054e5821c373':
Add handshake callback support
e3805c6144038207bc72654bd250054e5821c373 07-Mar-2014 Mike J. Chen <mjchen@google.com> Merge "Add handshake callback support" into klp-modular-dev
4a9c5ce6029d7fb06b8564a761f6bea5975d74f8 07-Mar-2014 Zhihai Xu <zhihaixu@google.com> am abce10c9: am e061a83b: Device cannot go to sleep while connected to HBM-570 BT headset

* commit 'abce10c9731e65ca11e6d5a80094bbd1bf1313fa':
Device cannot go to sleep while connected to HBM-570 BT headset
004550da492fb000ab08b6324558c1e4cbd383d4 29-Jan-2014 Srinu Jella <sjella@codeaurora.org> Bluetooth: Make Bonded device list operations are synchronous

Change the bonded device list to CopyOnWriteArrayList,to take
care of concurrent add/delete operations to the bonded device
list.

Change-Id: Ia4de2d35f2e30d6407716d0e60dc3bf4d05a2ac5
rc/com/android/bluetooth/btservice/AdapterProperties.java
7aa57706014942c1e3fcc94a0a1715d1afc98401 07-Mar-2014 Zhihai Xu <zhihaixu@google.com> am 7dca65bd: am 20c7c652: am abce10c9: am e061a83b: Device cannot go to sleep while connected to HBM-570 BT headset

* commit '7dca65bdb1e2cba4e31cf15079c0e8099d4a7e47':
Device cannot go to sleep while connected to HBM-570 BT headset
7dca65bdb1e2cba4e31cf15079c0e8099d4a7e47 06-Mar-2014 Zhihai Xu <zhihaixu@google.com> am 20c7c652: am abce10c9: am e061a83b: Device cannot go to sleep while connected to HBM-570 BT headset

* commit '20c7c6520d996dfebb1a6e89a9d145591305aa4d':
Device cannot go to sleep while connected to HBM-570 BT headset
20c7c6520d996dfebb1a6e89a9d145591305aa4d 06-Mar-2014 Zhihai Xu <zhihaixu@google.com> am abce10c9: am e061a83b: Device cannot go to sleep while connected to HBM-570 BT headset

* commit 'abce10c9731e65ca11e6d5a80094bbd1bf1313fa':
Device cannot go to sleep while connected to HBM-570 BT headset
abce10c9731e65ca11e6d5a80094bbd1bf1313fa 06-Mar-2014 Zhihai Xu <zhihaixu@google.com> am e061a83b: Device cannot go to sleep while connected to HBM-570 BT headset

* commit 'e061a83b8cbd872cd9f0fea33717aa57112e6228':
Device cannot go to sleep while connected to HBM-570 BT headset
873b8064cca4d0f32808842a39e54e305dd5b410 30-Oct-2013 Wei Wang <weiwa@google.com> DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change.

Add advertising data to Gatt Service/

Cherry picking ble advertising changes from master to KLP MR2.
b/13137996

Change-Id: I0ea7df8c159ad388d8e58768c49e785e9a4694bb
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/ProfileService.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/HandleMap.java
rc/com/android/bluetooth/gatt/ServiceDeclaration.java
e061a83b8cbd872cd9f0fea33717aa57112e6228 14-Oct-2013 Zhihai Xu <zhihaixu@google.com> Device cannot go to sleep while connected to HBM-570 BT headset

The headset never disconnect the Obex connection for PBAP,
so in this case, we never release the wakelock.
Our PBAP implementation won't release wakelock
until the Obex is disconnected by the remote device
To better control the wake lock, we should
only acquire the wakelock when we receive the reqeust from the remote device
will release the wakelock after we send the response packets.

bug:10957699
Change-Id: I85e0609e36788d9c36334dd804ec52c90b90615b
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
ed0c6ae1773ad1f4249fe3cf7447d7033195f222 29-Jan-2014 Ashwini Munigala <AshwiniM@codeaurora.org> MAP: Fix MMS pushMessage from OUTBOX to SENT folder

Fix content type value for MMS pushMessage
from MAP to OUTBOX to be successfully SENT over
network and listed in SENT folder.

Change-Id: I068619481355c19716627fef434f1f80bd2c2d23
rc/com/android/bluetooth/map/BluetoothMapContentObserver.java
448965010ed4fbaf546cc355d1766198f70c21fb 07-Jan-2014 Ashwini Munigala <AshwiniM@codeaurora.org> MAP: Handle MessageListing empty folder name if set to current path.

Check if destination folder is already setpath while processing
GetMessageListing Request for empty folderName.

Change-Id: I4ecd87264140fd347c71b428e3c4dffec3f91d48
rc/com/android/bluetooth/map/BluetoothMapObexServer.java
3a04c35ba5f723ee4a6e1f1c37514691ebd1447d 05-Mar-2014 Mike J. Chen <mjchen@google.com> Add handshake callback support

Change-Id: I7619e6e2ac3589ffa5e0b70e4b28e536c886ce02
Signed-off-by: Mike J. Chen <mjchen@google.com>
ni/com_android_bluetooth_hid.cpp
rc/com/android/bluetooth/hid/HidService.java
3b8e00b61402bde1d3d179087f030ea7ccd82135 04-Mar-2014 zzy <zhenye@broadcom.com> Exit bt process after cleanup

Added code to exit bt process and avoid android process caching.
The fix also gives end user a chance to recover a bad state bt process by
simply turning off/on the bluetooth. Since the process is not recycled,
the kernel frees up all leftover fd and memory and gives bt process a fresh start every time.

Change-Id: I616345da70bb60f1aeaab151a6bf6f793168a829
rc/com/android/bluetooth/btservice/AdapterService.java
5ff09a9b7b9de85a15888af6d9b2663c6241ab8a 01-Mar-2014 Wei Wang <weiwa@google.com> am 8c2da381: am 871bee0d: Add Bluetooth privileged permission to bluetooth app. fix b/13226130.

* commit '8c2da3812dbb1814089ac7fcd4edc0af89645a8f':
Add Bluetooth privileged permission to bluetooth app. fix b/13226130.
8c2da3812dbb1814089ac7fcd4edc0af89645a8f 01-Mar-2014 Wei Wang <weiwa@google.com> am 871bee0d: Add Bluetooth privileged permission to bluetooth app. fix b/13226130.

* commit '871bee0d1f380f2c04a9c02d03704f5f7407ef38':
Add Bluetooth privileged permission to bluetooth app. fix b/13226130.
871bee0d1f380f2c04a9c02d03704f5f7407ef38 28-Feb-2014 Wei Wang <weiwa@google.com> Add Bluetooth privileged permission to bluetooth app. fix b/13226130.

Change-Id: Iba48f4757a6b54911277900b875d83eaa81488b7
ndroidManifest.xml
9cda136cdea45d0e0d1cbdcd1bc073bc7d018fa0 25-Feb-2014 Matthew Xie <mattx@google.com> Merge "MAP: protected misspelled in message listing encoder"
22545e23dcec98dbc43e914c903c6a98ab08b1aa 05-Feb-2014 Kim Schulz <k.schulz@samsung.com> MAP: protected misspelled in message listing encoder

The keyword protected was misspelled in the message listing encoder.
Solution: change to protected.

The typo corrected.

Change-Id: I099a79a0076e297cfb89545910c750d4e074c3db
Bug: 12915358
rc/com/android/bluetooth/map/BluetoothMapMessageListingElement.java
0053efa4b58c3e5815a500bd719c5018e7e87852 04-Feb-2014 Kim Schulz <k.schulz@samsung.com> MAP: Empty parameter mask handled wrong

If an empty parameter mask is set in a get message listing request
we only returned the handles, where as the spec states that we
should return all parameters.

Solution: Set the parameter filter to 0xFFFF if it is omitted or 0.

Change-Id: I2cb99569c0920c706c0d3b3ed269852471cb1ee6
Bug: 12915453
rc/com/android/bluetooth/map/BluetoothMapAppParams.java
rc/com/android/bluetooth/map/BluetoothMapContent.java
23c13136cb6134d002c4940d89d492389281653c 24-Feb-2014 Matthew Xie <mattx@google.com> am e1bc19b7: am 27385b9b: Merge "PBAP: Remove initialisation of Missed calls number"

* commit 'e1bc19b7d99f2a29c305a8e4bb75969a66783def':
PBAP: Remove initialisation of Missed calls number
adff260dd1911b9e991aeba7eb7eb7dbc0392f1c 24-Feb-2014 Matthew Xie <mattx@google.com> am 2e486892: am 429460a8: Merge "OPP: Handle intent receiver leak for BT TURN OFF."

* commit '2e48689248aa50003ef648b12bf36f8c7e9dbd8c':
OPP: Handle intent receiver leak for BT TURN OFF.
44e0544b3169088a19df6c54a845e58b533000d0 24-Feb-2014 Matthew Xie <mattx@google.com> am b3abf4e5: am 4a57bce1: Merge "MAP: Set Empty name or address for unknown values in GetMessageListing."

* commit 'b3abf4e52a7045f914f88d07670c0d2fb231a75d':
MAP: Set Empty name or address for unknown values in GetMessageListing.
19079f6cdc86caddaf32607416ea490f08fd76b6 24-Feb-2014 Matthew Xie <mattx@google.com> am d08f6a6e: am 77b9e56b: Merge "Bluetooth: Update Signal strength"

* commit 'd08f6a6e926d7c9057c67b39ffabcdac04819586':
Bluetooth: Update Signal strength
e1bc19b7d99f2a29c305a8e4bb75969a66783def 24-Feb-2014 Matthew Xie <mattx@google.com> am 27385b9b: Merge "PBAP: Remove initialisation of Missed calls number"

* commit '27385b9b93a06862fed92f7260416276dbbbfa66':
PBAP: Remove initialisation of Missed calls number
2e48689248aa50003ef648b12bf36f8c7e9dbd8c 24-Feb-2014 Matthew Xie <mattx@google.com> am 429460a8: Merge "OPP: Handle intent receiver leak for BT TURN OFF."

* commit '429460a8ec5a1e0a7dc011acb80d3826b01b1936':
OPP: Handle intent receiver leak for BT TURN OFF.
b3abf4e52a7045f914f88d07670c0d2fb231a75d 24-Feb-2014 Matthew Xie <mattx@google.com> am 4a57bce1: Merge "MAP: Set Empty name or address for unknown values in GetMessageListing."

* commit '4a57bce1779e7dcd502dcbb64e7e121a700ba258':
MAP: Set Empty name or address for unknown values in GetMessageListing.
d08f6a6e926d7c9057c67b39ffabcdac04819586 24-Feb-2014 Matthew Xie <mattx@google.com> am 77b9e56b: Merge "Bluetooth: Update Signal strength"

* commit '77b9e56ba1dc3eadf39c46b470552031383e6786':
Bluetooth: Update Signal strength
27385b9b93a06862fed92f7260416276dbbbfa66 24-Feb-2014 Matthew Xie <mattx@google.com> Merge "PBAP: Remove initialisation of Missed calls number"
429460a8ec5a1e0a7dc011acb80d3826b01b1936 24-Feb-2014 Matthew Xie <mattx@google.com> Merge "OPP: Handle intent receiver leak for BT TURN OFF."
4a57bce1779e7dcd502dcbb64e7e121a700ba258 24-Feb-2014 Matthew Xie <mattx@google.com> Merge "MAP: Set Empty name or address for unknown values in GetMessageListing."
77b9e56ba1dc3eadf39c46b470552031383e6786 23-Feb-2014 Matthew Xie <mattx@google.com> Merge "Bluetooth: Update Signal strength"
28c90ba40b2bfd572860600d18e3dd3e2770e635 27-Nov-2013 Smriti Gupta <smritig@codeaurora.org> PBAP: Remove initialisation of Missed calls number

Thic change will remove initialisation of Missed calls number
at the time of connection as NewMissedCall number indicates the
number of missed calls that have been received on the PSE since
the last PullPhoneBook request on the mch folder, at the point
of the request.

Change-Id: I5f769011a34cfe8e7225fca646a58451639dcfa5
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
0487333556262f47feaa3f931d5a5c123386dd23 21-Nov-2013 Ashwini Munigala <AshwiniM@codeaurora.org> MAP: Set Empty name or address for unknown values in GetMessageListing.

Set Empty sender or recipient name and address values to indicate
info not available from MSE in GetMessageListing response.
Current implemenation to skip the entire feild in response doesnot
mark the uniformity for values being fetched from telephony or
phone book databases.

Change-Id: I44e2f61572607349ec20ec1efcc6c44abe084b83
rc/com/android/bluetooth/map/BluetoothMapContent.java
275aaa55584ba62ab176a30cdabc432a6ff875d2 03-Oct-2013 Ashwini Munigala <AshwiniM@codeaurora.org> OPP: Handle intent receiver leak for BT TURN OFF.

Mark INBOUND and OUTBOUND active transfer as cancelled
on BT TURN OFF.

Change-Id: I52e6d59ba56e004af2dc25b85975dfeb6c19320a
rc/com/android/bluetooth/opp/BluetoothOppService.java
ff44cbb06dcc8e1d0cbb346e0ea4af612ab2b33e 30-Nov-2013 Nitin Srivastava <nitinsr@codeaurora.org> Bluetooth: Update Signal strength

This change makes sure that signal
strength is updated properly when
there is no network service.

Change-Id: I8f2e9fedc4ac6f0d039c55d8211ed96fbe25317d
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
3ec105beaebd4d6abea80b52206b11032ab4f33c 29-Jan-2014 Sharvil Nanavati <sharvil@google.com> Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.

http://b/12788418

Change-Id: I7cc43db047457eb6a4ac501770a714eef0ed6422
rc/com/android/bluetooth/pan/PanService.java
f05fbcfbdb4d4e2b60bd81c80a3922ae24430fbf 01-Feb-2014 Sharvil Nanavati <sharvil@google.com> Update PAN JNI code to match updated interface definition.

This also fixes some weird internal reordering of arguments. All
of the implementations should match the interfaces now.

http://b/12853951

Change-Id: I019da4892204dd92ebf203e77bdb23af96c57697
ni/com_android_bluetooth_pan.cpp
062181981c4d5cf071f874eaf671c3392a600846 28-Jan-2014 Mike J. Chen <mjchen@google.com> am b8e4250d: HID: Hookup get_report_callback and return to Java via broadcast

* commit 'b8e4250de151551d5dacca895e62761355839d7d':
HID: Hookup get_report_callback and return to Java via broadcast
b8e4250de151551d5dacca895e62761355839d7d 28-Jan-2014 Mike J. Chen <mjchen@google.com> HID: Hookup get_report_callback and return to Java via broadcast

Change-Id: I5ee7ea72935834ba8a19f7933bb92b8a0a24ba62
Signed-off-by: Mike J. Chen <mjchen@google.com>
ni/com_android_bluetooth_hid.cpp
rc/com/android/bluetooth/hid/HidService.java
3ea493ddee643edb077e3d1fd8a0d26dca178024 15-Jan-2014 Matthew Xie <mattx@google.com> Merge "Use pathPrefix filter instead of path for /btopp content"
dc117dc785e09802aeaf8ca07f4a0333c4ff29b2 15-Jan-2014 Matthew Xie <mattx@google.com> Use pathPrefix filter instead of path for /btopp content

Update tests/AndroidManifest.xml to match the filter of the main app

Change-Id: Ife4278f34a588f77f6b00bd3f06aa69c6c83ac7a
ests/AndroidManifest.xml
955eb8b136c3c2dff5a5d550efe00c04e1b37314 15-Jan-2014 Daniel Cashman <dcashman@google.com> am 0ba8b42f: am 5d77afc4: am f0e15e66: am 3f298ffe: am e9428c35: am 7677468e: am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit '0ba8b42fab09bb10031f93bb9d7fc762c310c74f':
Use pathPrefix filter instead of path for /btopp content
0ba8b42fab09bb10031f93bb9d7fc762c310c74f 15-Jan-2014 Daniel Cashman <dcashman@google.com> am 5d77afc4: am f0e15e66: am 3f298ffe: am e9428c35: am 7677468e: am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit '5d77afc4f37931d05489d64f4f0fdffd7dc13336':
Use pathPrefix filter instead of path for /btopp content
5d77afc4f37931d05489d64f4f0fdffd7dc13336 15-Jan-2014 Daniel Cashman <dcashman@google.com> am f0e15e66: am 3f298ffe: am e9428c35: am 7677468e: am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit 'f0e15e6669ccfc319cfe943da0697808347951eb':
Use pathPrefix filter instead of path for /btopp content
f0e15e6669ccfc319cfe943da0697808347951eb 15-Jan-2014 Daniel Cashman <dcashman@google.com> am 3f298ffe: am e9428c35: am 7677468e: am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit '3f298ffe0add6b60e8d6265670928f84ce7d7338':
Use pathPrefix filter instead of path for /btopp content
3f298ffe0add6b60e8d6265670928f84ce7d7338 15-Jan-2014 Daniel Cashman <dcashman@google.com> am e9428c35: am 7677468e: am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit 'e9428c35344af989f9e643964a81e2dc0ce1ffe1':
Use pathPrefix filter instead of path for /btopp content
e9428c35344af989f9e643964a81e2dc0ce1ffe1 15-Jan-2014 Daniel Cashman <dcashman@google.com> am 7677468e: am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit '7677468ea5a2a71780e8bcf69a97c939b2ebc39b':
Use pathPrefix filter instead of path for /btopp content
7677468ea5a2a71780e8bcf69a97c939b2ebc39b 15-Jan-2014 Daniel Cashman <dcashman@google.com> am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit '884362fee9df9f2c61d61bc0926033de82e58f14':
Use pathPrefix filter instead of path for /btopp content
884362fee9df9f2c61d61bc0926033de82e58f14 15-Jan-2014 Daniel Cashman <dcashman@google.com> am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit 'ada9e95000f65d4ad7e5c697d48c76e6b9e54cf0':
Use pathPrefix filter instead of path for /btopp content
ada9e95000f65d4ad7e5c697d48c76e6b9e54cf0 15-Jan-2014 Daniel Cashman <dcashman@google.com> am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit '727741cd610b35e675e7b7769ddf431e5763344d':
Use pathPrefix filter instead of path for /btopp content
727741cd610b35e675e7b7769ddf431e5763344d 15-Jan-2014 Daniel Cashman <dcashman@google.com> Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev
0e174f7db75082af983df79717bc9ea26e8650e6 13-Jan-2014 Matthew Xie <mattx@google.com> am 750becdf: am cc3871cd: am b65d4111: am 6448d8a5: am 2a294154: am c4d45b2f: am e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit '750becdff590c7400234d36aa3b9056a99776435':
Use pathPrefix filter instead of path for /btopp content
750becdff590c7400234d36aa3b9056a99776435 13-Jan-2014 Matthew Xie <mattx@google.com> am cc3871cd: am b65d4111: am 6448d8a5: am 2a294154: am c4d45b2f: am e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit 'cc3871cda0fe13cb14a0f83d25134ed04e646dfc':
Use pathPrefix filter instead of path for /btopp content
cc3871cda0fe13cb14a0f83d25134ed04e646dfc 13-Jan-2014 Matthew Xie <mattx@google.com> am b65d4111: am 6448d8a5: am 2a294154: am c4d45b2f: am e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit 'b65d4111f2d3fdc0a0e6c852d90e7e7c764e562c':
Use pathPrefix filter instead of path for /btopp content
b65d4111f2d3fdc0a0e6c852d90e7e7c764e562c 13-Jan-2014 Matthew Xie <mattx@google.com> am 6448d8a5: am 2a294154: am c4d45b2f: am e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit '6448d8a59ff9cc765a2d9749683861312d95c3fa':
Use pathPrefix filter instead of path for /btopp content
6448d8a59ff9cc765a2d9749683861312d95c3fa 13-Jan-2014 Matthew Xie <mattx@google.com> am 2a294154: am c4d45b2f: am e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit '2a2941544f04af1e70f9be8cd6a62de6d545eaae':
Use pathPrefix filter instead of path for /btopp content
2a2941544f04af1e70f9be8cd6a62de6d545eaae 13-Jan-2014 Matthew Xie <mattx@google.com> am c4d45b2f: am e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit 'c4d45b2f898d77b61f8614e22645bfb8ecd00930':
Use pathPrefix filter instead of path for /btopp content
c4d45b2f898d77b61f8614e22645bfb8ecd00930 13-Jan-2014 Matthew Xie <mattx@google.com> am e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit 'e6643ed4cbe6d5ebe4f1a4979a78f81f6aeff1f0':
Use pathPrefix filter instead of path for /btopp content
e6643ed4cbe6d5ebe4f1a4979a78f81f6aeff1f0 13-Jan-2014 Matthew Xie <mattx@google.com> am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit '125338015bd96550c2d15d87a506640499820885':
Use pathPrefix filter instead of path for /btopp content
125338015bd96550c2d15d87a506640499820885 13-Jan-2014 Matthew Xie <mattx@google.com> am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit '8e13dea5f919737738db6e38c56cc83f43a7d555':
Use pathPrefix filter instead of path for /btopp content
8e13dea5f919737738db6e38c56cc83f43a7d555 13-Jan-2014 Matthew Xie <mattx@google.com> am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit 'fdcf402834c3f108a085a9c9b2f3be4848174f3b':
Use pathPrefix filter instead of path for /btopp content
fdcf402834c3f108a085a9c9b2f3be4848174f3b 13-Jan-2014 Matthew Xie <mattx@google.com> am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit 'a162ec5d684e4bf3e14ef1ddbd4a910c82915b93':
Use pathPrefix filter instead of path for /btopp content
8675e32253e835953d8c2cb983f0c0e5a3383ca1 13-Jan-2014 Matthew Xie <mattx@google.com> am 5830b657: am baf61647: am 9700464a: am 1e5ea551: am 014f9993: am bf0aa27e: am 14b74c3c: Use pathPrefix filter instead of path for /btopp content

* commit '5830b657ebf89ba6e6cf0dcfc48aecc710e49095':
Use pathPrefix filter instead of path for /btopp content
5830b657ebf89ba6e6cf0dcfc48aecc710e49095 13-Jan-2014 Matthew Xie <mattx@google.com> am baf61647: am 9700464a: am 1e5ea551: am 014f9993: am bf0aa27e: am 14b74c3c: Use pathPrefix filter instead of path for /btopp content

* commit 'baf616479161b02e6fe784dc22f2b97ee4e0c4f6':
Use pathPrefix filter instead of path for /btopp content
baf616479161b02e6fe784dc22f2b97ee4e0c4f6 13-Jan-2014 Matthew Xie <mattx@google.com> am 9700464a: am 1e5ea551: am 014f9993: am bf0aa27e: am 14b74c3c: Use pathPrefix filter instead of path for /btopp content

* commit '9700464a2b6fbef825bc278e3ef1cdc6783a0c26':
Use pathPrefix filter instead of path for /btopp content
56e291c577e5e2ff88d55632981a54ad1a362986 13-Jan-2014 Daniel Cashman <dcashman@google.com> am c40d6147: am 14ccee08: am 266dce78: am 4fd115eb: am 18c10a10: Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev

* commit 'c40d614731726adffec2de68df3a5a43ee289b30':
Use pathPrefix filter instead of path for /btopp content
9700464a2b6fbef825bc278e3ef1cdc6783a0c26 13-Jan-2014 Matthew Xie <mattx@google.com> am 1e5ea551: am 014f9993: am bf0aa27e: am 14b74c3c: Use pathPrefix filter instead of path for /btopp content

* commit '1e5ea5518f15533602a589d4c7c55f9e6e7b648b':
Use pathPrefix filter instead of path for /btopp content
c40d614731726adffec2de68df3a5a43ee289b30 13-Jan-2014 Daniel Cashman <dcashman@google.com> am 14ccee08: am 266dce78: am 4fd115eb: am 18c10a10: Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev

* commit '14ccee08ad0d5d78d91f0c82ec7ba9a550a16065':
Use pathPrefix filter instead of path for /btopp content
1e5ea5518f15533602a589d4c7c55f9e6e7b648b 13-Jan-2014 Matthew Xie <mattx@google.com> am 014f9993: am bf0aa27e: am 14b74c3c: Use pathPrefix filter instead of path for /btopp content

* commit '014f99934e57207df0b68e2c7468b923dc6539d2':
Use pathPrefix filter instead of path for /btopp content
14ccee08ad0d5d78d91f0c82ec7ba9a550a16065 13-Jan-2014 Daniel Cashman <dcashman@google.com> am 266dce78: am 4fd115eb: am 18c10a10: Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev

* commit '266dce782c074bcb3541f3d43e4b61ab67138370':
Use pathPrefix filter instead of path for /btopp content
014f99934e57207df0b68e2c7468b923dc6539d2 13-Jan-2014 Matthew Xie <mattx@google.com> am bf0aa27e: am 14b74c3c: Use pathPrefix filter instead of path for /btopp content

* commit 'bf0aa27ec7e106deb4fe61a10deebffcfe68b4bd':
Use pathPrefix filter instead of path for /btopp content
bf0aa27ec7e106deb4fe61a10deebffcfe68b4bd 13-Jan-2014 Matthew Xie <mattx@google.com> am 14b74c3c: Use pathPrefix filter instead of path for /btopp content

* commit '14b74c3c20e06cb69b4b624c3ebb9b72bb14090d':
Use pathPrefix filter instead of path for /btopp content
266dce782c074bcb3541f3d43e4b61ab67138370 13-Jan-2014 Daniel Cashman <dcashman@google.com> am 4fd115eb: am 18c10a10: Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev

* commit '4fd115eb21291d301f51aaf6fe260c5e9eecb718':
Use pathPrefix filter instead of path for /btopp content
4fd115eb21291d301f51aaf6fe260c5e9eecb718 13-Jan-2014 Daniel Cashman <dcashman@google.com> am 18c10a10: Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev

* commit '18c10a1061cf300ecdb73139f10b5092de0f3cb7':
Use pathPrefix filter instead of path for /btopp content
a162ec5d684e4bf3e14ef1ddbd4a910c82915b93 13-Jan-2014 Matthew Xie <mattx@google.com> am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit 'deb7bdad8cbe0501d414fdec698387714837f927':
Use pathPrefix filter instead of path for /btopp content
18c10a1061cf300ecdb73139f10b5092de0f3cb7 13-Jan-2014 Daniel Cashman <dcashman@google.com> Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev
0f496823a3529298cc3c16013ecc596a39f1659a 10-Jan-2014 Zhihai Xu <zhihaixu@google.com> Merge "update play status based on A2dp audio state from stack."
1edaf3d30ddcecf2f77bbfd880b6e4a7acb7a2c1 10-Jan-2014 Zhihai Xu <zhihaixu@google.com> Merge "fix incorrect track position reported from BT AVRCP"
aa6c1cb7f08a5d1fe2c878b587c62cf4dbb6ee8f 08-Jan-2014 Zhihai Xu <zhihaixu@google.com> fix incorrect track position reported from BT AVRCP

when music player continuously update playing state
with invalid play postion -1 during playing,
The track postion are not changed correcly.

bug:11377223
Change-Id: Ie4cecfe7757cb92fc96ea49a7442a9d0bd9fc63a
rc/com/android/bluetooth/a2dp/Avrcp.java
188f205b5f093850d4cc627917a21204be36c56a 08-Jan-2014 Zhihai Xu <zhihaixu@google.com> update play status based on A2dp audio state from stack.

this is to work around the problem:some video/audio player didn't
update the play status by calling setPlaybackState.
The headset(HBS730) register the play status update on the phone.
It will depend the play status reported from the phone to send
play or pause command.

bug:11325212
Change-Id: I7fde5960edd4a5b3474fa17456aacd5b4b432d4d
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/a2dp/Avrcp.java
6824a77ac3c760bb713aca66220704949c0b0866 07-Jan-2014 Zhihai Xu <zhihaixu@google.com> Merge " isA2dpPlaying() reports wrong playing state when suspended"
fe32e48d4129a3950f3a33f0ab443649b29205fb 07-Jan-2014 Zhihai Xu <zhihaixu@google.com> isA2dpPlaying() reports wrong playing state when suspended

bug:12412483
Change-Id: I1cf209479581bf28fc1ebdc462f552b8ec270520
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
34b421f80a640ba54466e7f92bd9253e03518d0d 07-Jan-2014 Baligh Uddin <baligh@google.com> am 203abe3f: (-s ours) am cdfbc2e8: (-s ours) am d4c5a505: (-s ours) am f12a0823: (-s ours) am ab233007: (-s ours) Import translations. DO NOT MERGE

* commit '203abe3f88fb7a8983566060bc179eaf90a2ccf1':
Import translations. DO NOT MERGE
203abe3f88fb7a8983566060bc179eaf90a2ccf1 07-Jan-2014 Baligh Uddin <baligh@google.com> am cdfbc2e8: (-s ours) am d4c5a505: (-s ours) am f12a0823: (-s ours) am ab233007: (-s ours) Import translations. DO NOT MERGE

* commit 'cdfbc2e8c990933377ac907f2b44dd3bfae81fb7':
Import translations. DO NOT MERGE
cdfbc2e8c990933377ac907f2b44dd3bfae81fb7 07-Jan-2014 Baligh Uddin <baligh@google.com> am d4c5a505: (-s ours) am f12a0823: (-s ours) am ab233007: (-s ours) Import translations. DO NOT MERGE

* commit 'd4c5a50532e123de06bfb96d73e5e891a20da883':
Import translations. DO NOT MERGE
d4c5a50532e123de06bfb96d73e5e891a20da883 07-Jan-2014 Baligh Uddin <baligh@google.com> am f12a0823: (-s ours) am ab233007: (-s ours) Import translations. DO NOT MERGE

* commit 'f12a0823d75bee975545575d96575bce849212f4':
Import translations. DO NOT MERGE
f12a0823d75bee975545575d96575bce849212f4 06-Jan-2014 Baligh Uddin <baligh@google.com> am ab233007: (-s ours) Import translations. DO NOT MERGE

* commit 'ab2330077166c093123e09555c62836d979edf71':
Import translations. DO NOT MERGE
c206a51130e358e6f76cfa2ea8c33d4434892a4a 06-Jan-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: If12dea506e2965a4a0cf7ceb5ce61236aba88de2
Auto-generated-cl: translation import
es/values-da/strings.xml
es/values-sk/strings.xml
ab2330077166c093123e09555c62836d979edf71 06-Jan-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I8452ddf1d6c278a8c0e8de1f501f000d5bcc8525
Auto-generated-cl: translation import
es/values-da/strings.xml
es/values-sk/strings.xml
14b74c3c20e06cb69b4b624c3ebb9b72bb14090d 06-Dec-2013 Matthew Xie <mattx@google.com> Use pathPrefix filter instead of path for /btopp content

path is doing a full path match. It did not guard /btopp/
also fix a minor problem in tests/AndroidManifest.xml
bug 11148516

Change-Id: I8f4a614f999e643e8ae122baf0bf898b2b3008d5
Conflicts:
tests/AndroidManifest.xml
ndroidManifest.xml
5eb524f77d5eb16ca5ba5305b36ce91b1d0caa66 06-Dec-2013 Matthew Xie <mattx@google.com> Use pathPrefix filter instead of path for /btopp content

path is doing a full path match. It did not guard /btopp/
also fix a minor problem in tests/AndroidManifest.xml
bug 11148516

Change-Id: I8f4a614f999e643e8ae122baf0bf898b2b3008d5
Conflicts:
tests/AndroidManifest.xml
ndroidManifest.xml
deb7bdad8cbe0501d414fdec698387714837f927 06-Dec-2013 Matthew Xie <mattx@google.com> Use pathPrefix filter instead of path for /btopp content

path is doing a full path match. It did not guard /btopp/
also fix a minor problem in tests/AndroidManifest.xml
bug 11148516

Change-Id: I8f4a614f999e643e8ae122baf0bf898b2b3008d5
Conflicts:
tests/AndroidManifest.xml
ndroidManifest.xml
418431cf3156a69fbb4bdfcc1e450cad38b67a3a 06-Dec-2013 Matthew Xie <mattx@google.com> Use pathPrefix filter instead of path for /btopp content

path is doing a full path match. It did not guard /btopp/
also fix a minor problem in tests/AndroidManifest.xml
bug 11148516

(cherry picked from commit 2819c1dbef39a712ab8adfcd36d2cb01f2379259)

Change-Id: I00b23e5c3a98422c2dd1cc220f2c121578ff5c8f
ndroidManifest.xml
ests/AndroidManifest.xml
a08fff0ae81757bdab00ae8865a906c711d5572f 30-Oct-2013 Wei Wang <weiwa@google.com> BLE peripheral mode (2/4): Gatt Service Change.

Change-Id: I0ea7df8c159ad388d8e58768c49e785e9a4694bb
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/ProfileService.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/HandleMap.java
rc/com/android/bluetooth/gatt/ServiceDeclaration.java
daaec40bbe227e6ee735da947afc72777f66c65d 18-Dec-2013 Zhihai Xu <zhihaixu@google.com> Merge "Device cannot go to sleep while connected to HBM-570 BT headset"
68c3d0efab4ad40abd13ff015a6a92bd60a4bd85 18-Dec-2013 Zhihai Xu <zhihaixu@google.com> Merge "release wakelock if no activity in Bluetooth MAP profile to avoid waste power."
a871a846ce37339a05fdf64b26bda0dc5bb6d565 17-Dec-2013 Zhihai Xu <zhihaixu@google.com> MAP: make MMS parsing more robust

Some devices are not following the specs correctly and send plan-text as MMS without the right headers.
This patch makes the MMS parser more robust against faulty MMS messages.
Bug: 11161383

Change-Id: Ib891f3cdc810d32082b3afe93ca18df4fcbff1be
rc/com/android/bluetooth/map/BluetoothMapObexServer.java
8fa8d120e86c7488616cc7f7310843f15278b5d9 14-Oct-2013 Zhihai Xu <zhihaixu@google.com> Device cannot go to sleep while connected to HBM-570 BT headset

The headset never disconnect the Obex connection for PBAP,
so in this case, we never release the wakelock.
Our PBAP implementation won't release wakelock
until the Obex is disconnected by the remote device
To better control the wake lock, we should
only acquire the wakelock when we receive the reqeust from the remote device
will release the wakelock after we send the response packets.

bug:10957699
Change-Id: I85e0609e36788d9c36334dd804ec52c90b90615b
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
c09b531ba47eee740485b0c6022981fc38ef1587 27-Nov-2013 Zhihai Xu <zhihaixu@google.com> release wakelock if no activity in Bluetooth MAP profile to avoid waste power.

bug:11138488
Change-Id: Ie7d8903cc917aee51711fa47f275863e4046f3d8
rc/com/android/bluetooth/map/BluetoothMapObexServer.java
rc/com/android/bluetooth/map/BluetoothMapService.java
rc/com/android/bluetooth/map/BluetoothMnsObexClient.java
2e7c4d9904b097efe6f07d31af3793b96b4d4e77 10-Oct-2013 Kim Schulz <k.schulz@samsung.com> MAP: make MMS parsing more robust

Some devices are not following the specs correctly and send plan-text as MMS without the right headers.
This patch makes the MMS parser more robust against faulty MMS messages.

Bug: 11161383
Change-Id: If5e59f9daaab4537cfe5d06e6203ae783e311fd3
rc/com/android/bluetooth/map/BluetoothMapContentObserver.java
rc/com/android/bluetooth/map/BluetoothMapObexServer.java
rc/com/android/bluetooth/map/BluetoothMapbMessageMmsEmail.java
b2312cd033ecc4821d82d8c994b91ea526a11aaf 10-Dec-2013 Qiwen Zhao <zhao@google.com> am bd4c3197: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev

* commit 'bd4c319790b5ac7be6694afd6ec9f9303acb0638':
8ebc534467000ebd73faf17fc106da0c5ef194ca 09-Dec-2013 Baligh Uddin <baligh@google.com> Remove deprecated locales

Bug:11340849
Change-Id: Ie17a9bcb48d08282e25e27265307ffc013b677f2
es/values-be/strings.xml
es/values-be/strings_pbap.xml
es/values-be/test_strings.xml
es/values-et/strings.xml
es/values-et/strings_map.xml
es/values-et/strings_pbap.xml
es/values-et/test_strings.xml
es/values-hy/strings.xml
es/values-hy/strings_map.xml
es/values-hy/strings_pbap.xml
es/values-hy/test_strings.xml
es/values-ka/strings.xml
es/values-ka/strings_map.xml
es/values-ka/strings_pbap.xml
es/values-ka/test_strings.xml
es/values-km/strings.xml
es/values-km/strings_map.xml
es/values-km/strings_pbap.xml
es/values-km/test_strings.xml
es/values-lo/strings.xml
es/values-lo/strings_map.xml
es/values-lo/strings_pbap.xml
es/values-lo/test_strings.xml
es/values-mn/strings.xml
es/values-mn/strings_map.xml
es/values-mn/strings_pbap.xml
es/values-mn/test_strings.xml
es/values-ms/strings.xml
es/values-ms/strings_map.xml
es/values-ms/strings_pbap.xml
es/values-ms/test_strings.xml
bd4c319790b5ac7be6694afd6ec9f9303acb0638 09-Dec-2013 Qiwen Zhao <zhao@google.com> DO NOT MERGE reset to goog/klp-volantis-dev
2819c1dbef39a712ab8adfcd36d2cb01f2379259 06-Dec-2013 Matthew Xie <mattx@google.com> Use pathPrefix filter instead of path for /btopp content

path is doing a full path match. It did not guard /btopp/
also fix a minor problem in tests/AndroidManifest.xml
bug 11148516

Change-Id: I8f4a614f999e643e8ae122baf0bf898b2b3008d5
ndroidManifest.xml
ests/AndroidManifest.xml
14f1f53e829b1d00f6c27618e878b1ebb18df8cc 11-Oct-2013 kschulz <k.schulz@samsung.com> MAP: fixed missing filtering on Priority

FilterPriority was ignored in the code as SMS does not have priority.
This fixes the support for the priority filter for sms + mms.
NOTICE: sms messages does not have priority and hence will return
an empty messagelisting if the client requests a list with priority
filter set til high-pri only.

Bug: 11168636
Change-Id: If028e47850323d20d1e9a23bc947782ae8da1df0
rc/com/android/bluetooth/map/BluetoothMapContent.java
16e4841811a702fb8f1e8b36cebefd6dda85cc67 05-Dec-2013 Baligh Uddin <baligh@google.com> am b5d25aca: (-s ours) am 0dac1504: (-s ours) am e76ce140: (-s ours) Import translations. DO NOT MERGE

* commit 'b5d25aca5721ddade8a32a4d2d7fe57d2f81988f':
b5d25aca5721ddade8a32a4d2d7fe57d2f81988f 05-Dec-2013 Baligh Uddin <baligh@google.com> am 0dac1504: (-s ours) am e76ce140: (-s ours) Import translations. DO NOT MERGE

* commit '0dac150402dd11f80f71a230b20e5a82accc1927':
72fb3e13a6090e10c68e91f89553ecc19f5bb3bd 22-Nov-2013 Matthew Xie <mattx@google.com> Merge "enable xml format to transfer/receive over bluetooth"
6cee3e67774303720cb07901bdf90d89884a28be 15-Nov-2013 Zhihai Xu <zhihaixu@google.com> am 322480a0: am f43652de: am 025c8ec1: Merge "remove a read lock to work around a platform deadlock problem." into klp-dev

* commit '322480a097a098ac39dd148e8aecc1106d5a3a88':
remove a read lock to work around a platform deadlock problem.
322480a097a098ac39dd148e8aecc1106d5a3a88 15-Nov-2013 Zhihai Xu <zhihaixu@google.com> am f43652de: am 025c8ec1: Merge "remove a read lock to work around a platform deadlock problem." into klp-dev

* commit 'f43652dec776a22a1306b4392867e2f0b8e855d0':
remove a read lock to work around a platform deadlock problem.
f43652dec776a22a1306b4392867e2f0b8e855d0 15-Nov-2013 Zhihai Xu <zhihaixu@google.com> am 025c8ec1: Merge "remove a read lock to work around a platform deadlock problem." into klp-dev

* commit '025c8ec1e42ccac17c896809c4e6d2cb90b3c71a':
remove a read lock to work around a platform deadlock problem.
025c8ec1e42ccac17c896809c4e6d2cb90b3c71a 15-Nov-2013 Zhihai Xu <zhihaixu@google.com> Merge "remove a read lock to work around a platform deadlock problem." into klp-dev
50f6cb42218fd50ed2532884d1212e1c9a74c7b2 15-Nov-2013 Zhihai Xu <zhihaixu@google.com> remove a read lock to work around a platform deadlock problem.

remove the lock in getStatefunction to work around a platform
deadlock problem.and also for read access, it is safe to remove
the lock to save CPU power

bug:11655066
Change-Id: Iddc0ada04010d95ae7d5fbc93ab837ebfc025b7a
rc/com/android/bluetooth/btservice/AdapterProperties.java
6f8d6f83d9e6f2b9fdfd9c4a69ca97562e38ab96 08-Nov-2013 Matthew Xie <mattx@google.com> am 60bfce5d: am 2c41d997: am 3987efa9: Merge "LE: Fix stack crash on invalid descriptor write request" into klp-dev

* commit '60bfce5dd906c5ba0f6f6908fb408f839d67d82a':
LE: Fix stack crash on invalid descriptor write request
60bfce5dd906c5ba0f6f6908fb408f839d67d82a 07-Nov-2013 Matthew Xie <mattx@google.com> am 2c41d997: am 3987efa9: Merge "LE: Fix stack crash on invalid descriptor write request" into klp-dev

* commit '2c41d99700f1a0512f6972d3836f9829cfa7995a':
LE: Fix stack crash on invalid descriptor write request
2c41d99700f1a0512f6972d3836f9829cfa7995a 07-Nov-2013 Matthew Xie <mattx@google.com> am 3987efa9: Merge "LE: Fix stack crash on invalid descriptor write request" into klp-dev

* commit '3987efa998a9bfbf148f83b286bfc3aeae62d87c':
LE: Fix stack crash on invalid descriptor write request
3987efa998a9bfbf148f83b286bfc3aeae62d87c 07-Nov-2013 Matthew Xie <mattx@google.com> Merge "LE: Fix stack crash on invalid descriptor write request" into klp-dev
460d53a0dd8fd19947b0382506bd2b3f9da4743b 01-Nov-2013 Andre Eisenbach <andre@broadcom.com> LE: Fix stack crash on invalid descriptor write request

Fix stack crash when an application attempts to writes a NULL array
using the writeDescriptor() function.
bug 11574019
Change-Id: Id2d7e49216fcc6e3af369047005fb7e67e0923db
ni/com_android_bluetooth_gatt.cpp
badff0258577d03ff742b5f211bbaf3ded1a8a85 07-Nov-2013 Matthew Xie <mattx@google.com> am ee6898a4: am e56c70f6: am cd68000c: Merge "cancel device discovery before start pairing process" into klp-dev

* commit 'ee6898a4b73d90ebe20bc0218a707d3dc7d6e641':
cancel device discovery before start pairing process
ee6898a4b73d90ebe20bc0218a707d3dc7d6e641 07-Nov-2013 Matthew Xie <mattx@google.com> am e56c70f6: am cd68000c: Merge "cancel device discovery before start pairing process" into klp-dev

* commit 'e56c70f66fc8fd0cbcd97999f6efe187049c062c':
cancel device discovery before start pairing process
e56c70f66fc8fd0cbcd97999f6efe187049c062c 07-Nov-2013 Matthew Xie <mattx@google.com> am cd68000c: Merge "cancel device discovery before start pairing process" into klp-dev

* commit 'cd68000c2c9eb487a4bdb718d966a3246fef4d59':
cancel device discovery before start pairing process
cd68000c2c9eb487a4bdb718d966a3246fef4d59 07-Nov-2013 Matthew Xie <mattx@google.com> Merge "cancel device discovery before start pairing process" into klp-dev
9ecfc6cfb40a0af13180905b6930111cfdf01c64 06-Nov-2013 Matthew Xie <mattx@google.com> cancel device discovery before start pairing process

During pairing process, SDP search is needed which cannot be handled
if we are doing device discovery
bug 11294130

Change-Id: Ic025fa3000af4f2d4c2c2ac411d26b6a99ad097c
rc/com/android/bluetooth/btservice/AdapterService.java
dae93d2f34c65604a0f83cc881956da36af64e9b 06-Nov-2013 Zhihai Xu <zhihaixu@google.com> am 2a963d9c: am 0b98b993: am 240e2c5c: Merge "FF/REW is not correctly for AVRCP." into klp-dev

* commit '2a963d9c3c34fa5af76b629160008838317bbb1a':
FF/REW is not correctly for AVRCP.
2a963d9c3c34fa5af76b629160008838317bbb1a 06-Nov-2013 Zhihai Xu <zhihaixu@google.com> am 0b98b993: am 240e2c5c: Merge "FF/REW is not correctly for AVRCP." into klp-dev

* commit '0b98b9933f0a2523ad333136777ef42982afc53a':
FF/REW is not correctly for AVRCP.
0b98b9933f0a2523ad333136777ef42982afc53a 06-Nov-2013 Zhihai Xu <zhihaixu@google.com> am 240e2c5c: Merge "FF/REW is not correctly for AVRCP." into klp-dev

* commit '240e2c5c8248747f0fac86d173a9161d09093d47':
FF/REW is not correctly for AVRCP.
240e2c5c8248747f0fac86d173a9161d09093d47 06-Nov-2013 Zhihai Xu <zhihaixu@google.com> Merge "FF/REW is not correctly for AVRCP." into klp-dev
68cf2cd280468b3a1d0ccbc5a35a4a42e94defcd 06-Nov-2013 Edward Jee <edjee@google.com> am 7d4c28ea: am 981c0006: am dedebbfb: Handles AT+BVRA=1 received during an open SCO session.

* commit '7d4c28ea6a75cf71a6dbb3401bef6982258461c1':
Handles AT+BVRA=1 received during an open SCO session.
7d4c28ea6a75cf71a6dbb3401bef6982258461c1 06-Nov-2013 Edward Jee <edjee@google.com> am 981c0006: am dedebbfb: Handles AT+BVRA=1 received during an open SCO session.

* commit '981c0006cd7a6a4a786afd73a7a80faf571b6733':
Handles AT+BVRA=1 received during an open SCO session.
981c0006cd7a6a4a786afd73a7a80faf571b6733 06-Nov-2013 Edward Jee <edjee@google.com> am dedebbfb: Handles AT+BVRA=1 received during an open SCO session.

* commit 'dedebbfb6eb1af92f013dedd234c2162cc2ec4be':
Handles AT+BVRA=1 received during an open SCO session.
dcaa8867cc699db261d00b7bb77a0b67f50bb630 05-Nov-2013 Baligh Uddin <baligh@google.com> am 4b6913e9: (-s ours) am 5a35fc13: (-s ours) am 79098ae2: (-s ours) Import translations. DO NOT MERGE

* commit '4b6913e901a290c7271a517489e657b7a2f30729':
Import translations. DO NOT MERGE
dedebbfb6eb1af92f013dedd234c2162cc2ec4be 09-Oct-2013 Edward Jee <edjee@google.com> Handles AT+BVRA=1 received during an open SCO session.

Bug: 11072505
Change-Id: If665517cd9efa087154edd57b23163e7cc098f6f
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
4b6913e901a290c7271a517489e657b7a2f30729 05-Nov-2013 Baligh Uddin <baligh@google.com> am 5a35fc13: (-s ours) am 79098ae2: (-s ours) Import translations. DO NOT MERGE

* commit '5a35fc139c772f04a1b314eb7a4062e16cfa8ebd':
Import translations. DO NOT MERGE
5a35fc139c772f04a1b314eb7a4062e16cfa8ebd 05-Nov-2013 Baligh Uddin <baligh@google.com> am 79098ae2: (-s ours) Import translations. DO NOT MERGE

* commit '79098ae27876a881e865e029d2c91db5bc4e498d':
Import translations. DO NOT MERGE
64c3aa6f3a5047aa70d605cf530d60c773db9087 05-Nov-2013 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
1c8059afdf99cadda5ca62c9eec921d9b3b4b42d 05-Nov-2013 Zhihai Xu <zhihaixu@google.com> am 4945ac80: am 2665ad11: am 9dc561f7: Merge "NPE in bluetooth MAP cause bluetooth process crash" into klp-dev

* commit '4945ac8099eb35112307f94c7c5ea7513f657fd3':
NPE in bluetooth MAP cause bluetooth process crash
4945ac8099eb35112307f94c7c5ea7513f657fd3 05-Nov-2013 Zhihai Xu <zhihaixu@google.com> am 2665ad11: am 9dc561f7: Merge "NPE in bluetooth MAP cause bluetooth process crash" into klp-dev

* commit '2665ad11e9e3794dab5f5591ec0fceafddb2d58d':
NPE in bluetooth MAP cause bluetooth process crash
51dfad33c634776027ecafef915b49b21e370232 04-Nov-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I0c5045887f4ee93c84f18d682a2ee7dde3b53645
Auto-generated-cl: translation import
es/values-hi/strings.xml
79098ae27876a881e865e029d2c91db5bc4e498d 04-Nov-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I5ca5b6507989bc70ccc1cb5790e9a5b8b45caeb4
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-ar/strings_pbap.xml
es/values-ar/test_strings.xml
es/values-fa/strings.xml
es/values-fa/strings_pbap.xml
es/values-fa/test_strings.xml
es/values-hi/strings.xml
es/values-iw/strings.xml
es/values-iw/strings_pbap.xml
es/values-iw/test_strings.xml
2665ad11e9e3794dab5f5591ec0fceafddb2d58d 02-Nov-2013 Zhihai Xu <zhihaixu@google.com> am 9dc561f7: Merge "NPE in bluetooth MAP cause bluetooth process crash" into klp-dev

* commit '9dc561f7f13569552a62f771b16fe35dc5b9cd16':
NPE in bluetooth MAP cause bluetooth process crash
9dc561f7f13569552a62f771b16fe35dc5b9cd16 02-Nov-2013 Zhihai Xu <zhihaixu@google.com> Merge "NPE in bluetooth MAP cause bluetooth process crash" into klp-dev
19e4c6abe87d6c213e802ecf7af6c1d00e1f4b65 02-Nov-2013 Zhihai Xu <zhihaixu@google.com> FF/REW is not correctly for AVRCP.

While a music is being played, if FF/REW is pressed on the connected device,
it remains in the FF/REW state constantly (on the Porsche / Audi A8 carkit)

bug:11377223
Change-Id: Iee5468308f2786839c3a047c95dfa0a49ef28efb
rc/com/android/bluetooth/a2dp/Avrcp.java
9679a425747e95082e169b3bd3673ed6b5a27590 31-Oct-2013 Zhihai Xu <zhihaixu@google.com> NPE in bluetooth MAP cause bluetooth process crash

bug:11448104
Change-Id: I30045162c89e2150a9ef476f33e1b322e7cc9a44
rc/com/android/bluetooth/map/BluetoothMnsObexClient.java
cb4a97b73450517b8351691b9c9a1ecd7979bca5 30-Oct-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ib31d8386e34ca0e2d42505148536e4c4b9bc0718
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-ar/strings_pbap.xml
es/values-ar/test_strings.xml
es/values-fa/strings.xml
es/values-fa/strings_pbap.xml
es/values-fa/test_strings.xml
es/values-iw/strings.xml
es/values-iw/strings_pbap.xml
es/values-iw/test_strings.xml
1c541f3b3274544795dfdf41c7d1906b2035648f 28-Oct-2013 Baligh Uddin <baligh@google.com> am 082a5ae1: (-s ours) am 48892c8f: (-s ours) am 80be110d: (-s ours) Import translations. DO NOT MERGE

* commit '082a5ae1ac876f79c8bb7f5c96534b9e5df94a9d':
Import translations. DO NOT MERGE
41925d992261b1012201d1b89be9df20d587e633 28-Oct-2013 Zhihai Xu <zhihaixu@google.com> am 29189533: am d2e9f926: am 82492947: MAP: fix problem with MNS not disconnecting correctly

* commit '2918953346cad7a847f6f17f5934c72256c0bf49':
MAP: fix problem with MNS not disconnecting correctly
082a5ae1ac876f79c8bb7f5c96534b9e5df94a9d 28-Oct-2013 Baligh Uddin <baligh@google.com> am 48892c8f: (-s ours) am 80be110d: (-s ours) Import translations. DO NOT MERGE

* commit '48892c8fac096c33d549fbc78cacf8d53c93c154':
Import translations. DO NOT MERGE
48892c8fac096c33d549fbc78cacf8d53c93c154 28-Oct-2013 Baligh Uddin <baligh@google.com> am 80be110d: (-s ours) Import translations. DO NOT MERGE

* commit '80be110dc97436264d402adb62f8c1c631fd36e9':
Import translations. DO NOT MERGE
80be110dc97436264d402adb62f8c1c631fd36e9 28-Oct-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I75b1aeb7c88fa9a3c678f91a2d88a95fa63f80df
Auto-generated-cl: translation import
es/values-hi/strings.xml
2918953346cad7a847f6f17f5934c72256c0bf49 24-Oct-2013 Zhihai Xu <zhihaixu@google.com> am d2e9f926: am 82492947: MAP: fix problem with MNS not disconnecting correctly

* commit 'd2e9f9266d5efe9400ba0bdeca2ea61b8510e3e3':
MAP: fix problem with MNS not disconnecting correctly
d2e9f9266d5efe9400ba0bdeca2ea61b8510e3e3 24-Oct-2013 Zhihai Xu <zhihaixu@google.com> am 82492947: MAP: fix problem with MNS not disconnecting correctly

* commit '824929471ee80476e6d6774eedac9f30c5623eb2':
MAP: fix problem with MNS not disconnecting correctly
824929471ee80476e6d6774eedac9f30c5623eb2 23-Oct-2013 Zhihai Xu <zhihaixu@google.com> MAP: fix problem with MNS not disconnecting correctly

MNS is needed to disconnect with the MSE but did not.
This patch fixes that by re-adding a disconnect() that was wrongfully removed during review.
Patch set 2:
-----------
- Split disconnect and shutdown for MNS connection
bug: 11161674
Change-Id: Idd09fc774584dfdb171b0d00be0f7711ae57b853
rc/com/android/bluetooth/map/BluetoothMapService.java
rc/com/android/bluetooth/map/BluetoothMnsObexClient.java
bcca9f608f16476205e7b710b6a256bc0150af39 22-Oct-2013 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
e75205760de56a7e5339c86ae759462cfdf2981b 22-Oct-2013 Matthew Xie <mattx@google.com> am 50f08db8: am 3755cde5: am dce8f102: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev

* commit '50f08db8a9100b79d7284406eaf2daae3af6a371':
Change pairing api/intent permission from PRIVILEGED to ADMIN
50f08db8a9100b79d7284406eaf2daae3af6a371 22-Oct-2013 Matthew Xie <mattx@google.com> am 3755cde5: am dce8f102: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev

* commit '3755cde5fd20306f3965e7b317e3763640b11b42':
Change pairing api/intent permission from PRIVILEGED to ADMIN
3755cde5fd20306f3965e7b317e3763640b11b42 22-Oct-2013 Matthew Xie <mattx@google.com> am dce8f102: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev

* commit 'dce8f102f76aeea3356c5416b8ebb5e5c8b5cb22':
Change pairing api/intent permission from PRIVILEGED to ADMIN
dce8f102f76aeea3356c5416b8ebb5e5c8b5cb22 22-Oct-2013 Matthew Xie <mattx@google.com> Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev
810c49b2cfece1c48ced464d6bd2509ec4cac7a3 22-Oct-2013 Matthew Xie <mattx@google.com> Change pairing api/intent permission from PRIVILEGED to ADMIN

The APIs are createBond, setPin, setPairingConfirmation
The intent is ACTION_PAIRING_REQUEST
bug 11101076

Change-Id: I3b065ab0348a964bb557e57527491b2f34e68a81
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
5ce400e15137a721548d6592ca362803acbeff4b 21-Oct-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Id50e8e0a898506fe0ff44f4dc5e82953067619f3
Auto-generated-cl: translation import
es/values-hi/strings.xml
5ed9e7a4fde67f5f50e8681c3340c99263783196 18-Oct-2013 Zhihai Xu <zhihaixu@google.com> am 1763de2c: am a58a4068: am 311fd8bf: Bluetooth Application Crash while try to pairing with laptop - IKDVXPSE-345

* commit '1763de2c204a587dcfc04fa4324e415dd070139a':
Bluetooth Application Crash while try to pairing with laptop - IKDVXPSE-345
1763de2c204a587dcfc04fa4324e415dd070139a 18-Oct-2013 Zhihai Xu <zhihaixu@google.com> am a58a4068: am 311fd8bf: Bluetooth Application Crash while try to pairing with laptop - IKDVXPSE-345

* commit 'a58a4068a42d9b705a2501559c0e8600306ad573':
Bluetooth Application Crash while try to pairing with laptop - IKDVXPSE-345
a58a4068a42d9b705a2501559c0e8600306ad573 18-Oct-2013 Zhihai Xu <zhihaixu@google.com> am 311fd8bf: Bluetooth Application Crash while try to pairing with laptop - IKDVXPSE-345

* commit '311fd8bf28c1c16c4da81485b26518c8df97f50b':
Bluetooth Application Crash while try to pairing with laptop - IKDVXPSE-345
311fd8bf28c1c16c4da81485b26518c8df97f50b 17-Oct-2013 Zhihai Xu <zhihaixu@google.com> Bluetooth Application Crash while try to pairing with laptop - IKDVXPSE-345

the handleRegistration will never run after we shutdown the handler thread first,
with this change, we can make sure the mObserver will never be null
when call handleRegistration.
bug:11148404

Change-Id: I93b351915b49cf59a7d2026b7d83a68a7e76dd38
rc/com/android/bluetooth/map/BluetoothMnsObexClient.java
7e0846c35f5e15749969f33375e36ec0de7e25a8 17-Oct-2013 Ed Heyl <edheyl@google.com> am 6ddd2009: am 587fa0b4: am 565caebc: merge in klp-release (no-op)

* commit '6ddd2009ce3593e3df4bc4b5ce739210e68ccbac':
6ddd2009ce3593e3df4bc4b5ce739210e68ccbac 17-Oct-2013 Ed Heyl <edheyl@google.com> am 587fa0b4: am 565caebc: merge in klp-release (no-op)

* commit '587fa0b43e4ccb2479003f54364ff75b7eab7c11':
587fa0b43e4ccb2479003f54364ff75b7eab7c11 17-Oct-2013 Ed Heyl <edheyl@google.com> am 565caebc: merge in klp-release (no-op)

* commit '565caebcfc6ba053bbd765cdc9da63b38530c22e':
565caebcfc6ba053bbd765cdc9da63b38530c22e 17-Oct-2013 Ed Heyl <edheyl@google.com> merge in klp-release (no-op)
d8add7d3b713ec460815552a522e13f7350eb8c9 14-Oct-2013 Casper Bonde <c.bonde@samsung.com> am ded8689b: am 1d8e1090: am 98df3e8f: Fix for MAP/PBAP: Race-condition when requesting authorization from Settings app

* commit 'ded8689b33b1f345aafeea82b972c8b8cfab09cf':
Fix for MAP/PBAP: Race-condition when requesting authorization from Settings app
01caef0f3e03afb236f6a980fe56e26cac947133 13-Oct-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
ded8689b33b1f345aafeea82b972c8b8cfab09cf 12-Oct-2013 Casper Bonde <c.bonde@samsung.com> am 1d8e1090: am 98df3e8f: Fix for MAP/PBAP: Race-condition when requesting authorization from Settings app

* commit '1d8e1090e1e19520749d906701c1aa27dac41a61':
Fix for MAP/PBAP: Race-condition when requesting authorization from Settings app
1d8e1090e1e19520749d906701c1aa27dac41a61 12-Oct-2013 Casper Bonde <c.bonde@samsung.com> am 98df3e8f: Fix for MAP/PBAP: Race-condition when requesting authorization from Settings app

* commit '98df3e8ff33a6137d4ea13845b583aaee2670613':
Fix for MAP/PBAP: Race-condition when requesting authorization from Settings app
98df3e8ff33a6137d4ea13845b583aaee2670613 11-Oct-2013 Casper Bonde <c.bonde@samsung.com> Fix for MAP/PBAP: Race-condition when requesting authorization from Settings app

When MAP and PBAP requests authorization from the Settings app via Intents,
it also sets a state isWaitingForAuthorization to indicate
that it should handle incoming replies.
This is however done in the code after the intent have been sent
and in some cases the reply for the intent is returned
before the state has been update = no handling of the reply.
This only happens on the second connect with a paired device and
only when the user have selected the "do not ask again" checkmark
in the popup requesting access.

FIX:
Move the update of isWaitingAuthorization to before sending the intent to settings

bug: 11179645
Change-Id: I25b019e32a01caa8509c8f97195712120823afa9
rc/com/android/bluetooth/map/BluetoothMapService.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
dc7d29a3958e08186b887e0bfc943978f08c9996 10-Oct-2013 Edward Jee <edjee@google.com> am 9b2fbb84: am c5253c9d: am c3cbf72f: Allows another GMS core app to handle ACTION_PAIRING_REQUEST .

* commit '9b2fbb84ec3d673e337d9bf2927056077739e2f0':
Allows another GMS core app to handle ACTION_PAIRING_REQUEST .
9b2fbb84ec3d673e337d9bf2927056077739e2f0 10-Oct-2013 Edward Jee <edjee@google.com> am c5253c9d: am c3cbf72f: Allows another GMS core app to handle ACTION_PAIRING_REQUEST .

* commit 'c5253c9d5c66330ea3de51b7232eecb13738f151':
Allows another GMS core app to handle ACTION_PAIRING_REQUEST .
c5253c9d5c66330ea3de51b7232eecb13738f151 10-Oct-2013 Edward Jee <edjee@google.com> am c3cbf72f: Allows another GMS core app to handle ACTION_PAIRING_REQUEST .

* commit 'c3cbf72f596c2af659905e06e85a5ac1241610a8':
Allows another GMS core app to handle ACTION_PAIRING_REQUEST .
c3cbf72f596c2af659905e06e85a5ac1241610a8 05-Oct-2013 Edward Jee <edjee@google.com> Allows another GMS core app to handle ACTION_PAIRING_REQUEST .

Now we use sendOrderedBroadcast for ACTION_PAIRING_REQUEST , and to
receive this intent, BLUETOOTH_PRIVILEGED is required.

Bug: 11087521
Change-Id: I6aa2fbc6538df39b24f141e7d75adc3658a7e7ac
rc/com/android/bluetooth/btservice/RemoteDevices.java
3a922bbc9656de575e15b0e265cecd240cf42365 10-Oct-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
9f7fa15a6beb6700e56b59bf9bfd4b9f0355767e 10-Oct-2013 Zhihai Xu <zhihaixu@google.com> am fd0c296a: am 2d4b7b73: am c14e9468: Merge "Remove MMS support from MAP profile" into klp-dev

* commit 'fd0c296a9f6bf6a85acb8597ef480ce21154d40f':
Remove MMS support from MAP profile
fd0c296a9f6bf6a85acb8597ef480ce21154d40f 10-Oct-2013 Zhihai Xu <zhihaixu@google.com> am 2d4b7b73: am c14e9468: Merge "Remove MMS support from MAP profile" into klp-dev

* commit '2d4b7b7362036e7f864b1d9eeb39d671359e9f7b':
Remove MMS support from MAP profile
2d4b7b7362036e7f864b1d9eeb39d671359e9f7b 10-Oct-2013 Zhihai Xu <zhihaixu@google.com> am c14e9468: Merge "Remove MMS support from MAP profile" into klp-dev

* commit 'c14e9468d79579bda0e6f15823ffb53c30e831a1':
Remove MMS support from MAP profile
c14e9468d79579bda0e6f15823ffb53c30e831a1 10-Oct-2013 Zhihai Xu <zhihaixu@google.com> Merge "Remove MMS support from MAP profile" into klp-dev
c3ec58fcc54cb33635f4dee746ee22cb8b0e3210 10-Oct-2013 Zhihai Xu <zhihaixu@google.com> Remove MMS support from MAP profile

reject to push MMS message, will support it in the future
bug 10296324

Change-Id: Idf2aa081b049e323422223d7b24f6404de2d7184
rc/com/android/bluetooth/map/BluetoothMapContentObserver.java
993a018a5a40753ddbe91511eb30d1f0179310dc 09-Oct-2013 Ed Heyl <edheyl@google.com> am 870a6a54: am ff7dc101: am 205b3775: merge in KQS81M

* commit '870a6a5427f4a23d6fe5bd3ac9bb49d82c86e9c7':
Add MEDIA_CONTENT_CONTROL permission
870a6a5427f4a23d6fe5bd3ac9bb49d82c86e9c7 09-Oct-2013 Ed Heyl <edheyl@google.com> am ff7dc101: am 205b3775: merge in KQS81M

* commit 'ff7dc1010bd9c38c5b3348ed15d8deda62e13604':
Add MEDIA_CONTENT_CONTROL permission
ff7dc1010bd9c38c5b3348ed15d8deda62e13604 09-Oct-2013 Ed Heyl <edheyl@google.com> am 205b3775: merge in KQS81M

* commit '205b3775e344734c9aa0776a8ee14d2cde1f411e':
Add MEDIA_CONTENT_CONTROL permission
205b3775e344734c9aa0776a8ee14d2cde1f411e 09-Oct-2013 Ed Heyl <edheyl@google.com> merge in KQS81M
fff2a7ad24d50bfabfe34eac2f43813139c2a55e 08-Oct-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
2ce37ff284bafb5d3ce60736ea95553b3317febc 07-Oct-2013 Jean-Michel Trivi <jmtrivi@google.com> am fbfd55a8: am d2b8377f: am ce827197: Merge "Update AVRCP implementation of IRemoteControlDisplay" into klp-dev

* commit 'fbfd55a85870939523665dfd7c24844d3e3c4715':
Update AVRCP implementation of IRemoteControlDisplay
fbfd55a85870939523665dfd7c24844d3e3c4715 07-Oct-2013 Jean-Michel Trivi <jmtrivi@google.com> am d2b8377f: am ce827197: Merge "Update AVRCP implementation of IRemoteControlDisplay" into klp-dev

* commit 'd2b8377f82a65c76606acbd10802648a378bf673':
Update AVRCP implementation of IRemoteControlDisplay
d2b8377f82a65c76606acbd10802648a378bf673 07-Oct-2013 Jean-Michel Trivi <jmtrivi@google.com> am ce827197: Merge "Update AVRCP implementation of IRemoteControlDisplay" into klp-dev

* commit 'ce8271970cbfaf3ba52250a9b02e6f73f87fef70':
Update AVRCP implementation of IRemoteControlDisplay
ce8271970cbfaf3ba52250a9b02e6f73f87fef70 07-Oct-2013 Jean-Michel Trivi <jmtrivi@google.com> Merge "Update AVRCP implementation of IRemoteControlDisplay" into klp-dev
400e19fa69c960a25974da0f460ccd74117de8b7 06-Oct-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
5d8d3edc956531fb4a4101a0d282335806378685 04-Oct-2013 Baligh Uddin <baligh@google.com> am 730f55ad: (-s ours) am 486e56ba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '730f55ad85b12757d47b2d3c0533aa2c12575009':
Import translations. DO NOT MERGE
761d92274ee64965498d63e4002b55498bd263b5 04-Oct-2013 Baligh Uddin <baligh@google.com> am 858bae19: (-s ours) am 6f54a553: (-s ours) am 5d00ba23: (-s ours) Import translations. DO NOT MERGE

* commit '858bae19ea42517b6e0a9b935be26151691385ba':
Import translations. DO NOT MERGE
730f55ad85b12757d47b2d3c0533aa2c12575009 04-Oct-2013 Baligh Uddin <baligh@google.com> am 486e56ba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '486e56ba589fcb7884e66d13af4a18faae8e83ad':
Import translations. DO NOT MERGE
486e56ba589fcb7884e66d13af4a18faae8e83ad 04-Oct-2013 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into klp-ub-dev
858bae19ea42517b6e0a9b935be26151691385ba 04-Oct-2013 Baligh Uddin <baligh@google.com> am 6f54a553: (-s ours) am 5d00ba23: (-s ours) Import translations. DO NOT MERGE

* commit '6f54a5532c43fefcf9b3458cf17a67f3a8f27106':
Import translations. DO NOT MERGE
6f54a5532c43fefcf9b3458cf17a67f3a8f27106 04-Oct-2013 Baligh Uddin <baligh@google.com> am 5d00ba23: (-s ours) Import translations. DO NOT MERGE

* commit '5d00ba23630c3eed71f885986211754d525eec62':
Import translations. DO NOT MERGE
daa74f29cb390d8fe4b06282da1ad744b2da3efe 04-Oct-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I2e910ac586b3d487d28b5ff129d5b8e1cb946708
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-sw/strings.xml
c3d8a5bd61632e28ef5a9c7cf078a9339793cdad 04-Oct-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I028376e1ae65fa0517945c2eb2e73cedccd1037f
Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-lo-rLA/strings.xml
es/values-sw/strings.xml
5d00ba23630c3eed71f885986211754d525eec62 04-Oct-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I4aa104f811eb821da26ed448b93ae70bbb87712a
Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-lo-rLA/strings.xml
es/values-sw/strings.xml
5a0368956f3314a891766ea005b55329ab6db8fc 04-Oct-2013 Jean-Michel Trivi <jmtrivi@google.com> Update AVRCP implementation of IRemoteControlDisplay

Add implementation of new method in IRemoteControlDisplay.

Bug 8209392

Change-Id: Ic700be5476cb2f70b6a26098cbed3e8e130b3573
rc/com/android/bluetooth/a2dp/Avrcp.java
dba4a3a7bb6add01022624adaa3e8c1aa9d57e8a 02-Oct-2013 Matthew Xie <mattx@google.com> am 58eadb61: am cbfd9612: Merge "Change setPin, setPin, setPairingConfirmation permission level to BLUETOOTH_PRIVILEGED" into klp-dev

* commit '58eadb614abc047a20a1c2e3a0e043a19e4e2f14':
Change setPin, setPin, setPairingConfirmation permission level to BLUETOOTH_PRIVILEGED
7fda9c4ee47dd553fed98c758793a4a27c328e10 02-Oct-2013 Zhihai Xu <zhihaixu@google.com> am 6763446b: am db72c920: Merge "Unable to receive Text Message to CAR Kit(nuvi3580LM)" into klp-dev

* commit '6763446bce0c0185175dc2526820fb5d6ac5dad1':
b511616303b0fff031a04b2ad7a2339d9e983a20 01-Oct-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
58eadb614abc047a20a1c2e3a0e043a19e4e2f14 01-Oct-2013 Matthew Xie <mattx@google.com> am cbfd9612: Merge "Change setPin, setPin, setPairingConfirmation permission level to BLUETOOTH_PRIVILEGED" into klp-dev

* commit 'cbfd961209f35c5183a9dc7ee5d34954e6e32d6e':
Change setPin, setPin, setPairingConfirmation permission level to BLUETOOTH_PRIVILEGED
8dc7ea0973758522272d6cba5ad078ef7ccab6d4 01-Oct-2013 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
6763446bce0c0185175dc2526820fb5d6ac5dad1 01-Oct-2013 Zhihai Xu <zhihaixu@google.com> am db72c920: Merge "Unable to receive Text Message to CAR Kit(nuvi3580LM)" into klp-dev

* commit 'db72c9202b6309104b231d166c51c1f7ceca3efa':
Unable to receive Text Message to CAR Kit(nuvi3580LM)
4d28088df99f709693dc0fb017ab412d8fbe9975 30-Sep-2013 Zhihai Xu <zhihaixu@google.com> am db72c920: Merge "Unable to receive Text Message to CAR Kit(nuvi3580LM)" into klp-dev

* commit 'db72c9202b6309104b231d166c51c1f7ceca3efa':
Unable to receive Text Message to CAR Kit(nuvi3580LM)
cbfd961209f35c5183a9dc7ee5d34954e6e32d6e 30-Sep-2013 Matthew Xie <mattx@google.com> Merge "Change setPin, setPin, setPairingConfirmation permission level to BLUETOOTH_PRIVILEGED" into klp-dev
a615e32372bf4d333b9789f2b4cdac5c9269bbfb 30-Sep-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I5c85b6f21c78d5abdb050e836536ef2bca7564d5
Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-lo-rLA/strings.xml
d0c84056fbc132d0aa0dc1f29064b19cd0bd2822 29-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
8dbf324f8e96fe1623467a72f11412d93564df2b 24-Sep-2013 Matthew Xie <mattx@google.com> Change setPin, setPin, setPairingConfirmation permission level to BLUETOOTH_PRIVILEGED

bug 9987787

Change-Id: I2fe88f4c284d8403d79e08194bf7a720b305d029
rc/com/android/bluetooth/btservice/AdapterService.java
d943cb7d23ef1dc9ac43354b3f2e521d5d810637 27-Sep-2013 Matthew Xie <mattx@android.com> am 01ba103b: am 8cce6da9: Merge "AtPhonebook handleCpbsCommand was incorrectly sending two responses to some requests (one inside the swtich statement, then repeating it after breaking out of the switch statement). This broke phonebook sync with Audi 2G MMI car kit. S

* commit '01ba103be055c3124d2dabc31d8e65dc7742be49':
AtPhonebook handleCpbsCommand was incorrectly sending two responses to some requests (one inside the swtich statement, then repeating it after breaking out of the switch statement). This broke phonebook sync with Audi 2G MMI car kit. Signed-off-by: Nigel Hannam <nigel@hannam.eu>
01ba103be055c3124d2dabc31d8e65dc7742be49 27-Sep-2013 Matthew Xie <mattx@android.com> am 8cce6da9: Merge "AtPhonebook handleCpbsCommand was incorrectly sending two responses to some requests (one inside the swtich statement, then repeating it after breaking out of the switch statement). This broke phonebook sync with Audi 2G MMI car kit. Signed-off-by:

* commit '8cce6da9099e72000182d1406e7238b8f697ef13':
AtPhonebook handleCpbsCommand was incorrectly sending two responses to some requests (one inside the swtich statement, then repeating it after breaking out of the switch statement). This broke phonebook sync with Audi 2G MMI car kit. Signed-off-by: Nigel Hannam <nigel@hannam.eu>
db72c9202b6309104b231d166c51c1f7ceca3efa 27-Sep-2013 Zhihai Xu <zhihaixu@google.com> Merge "Unable to receive Text Message to CAR Kit(nuvi3580LM)" into klp-dev
8cce6da9099e72000182d1406e7238b8f697ef13 27-Sep-2013 Matthew Xie <mattx@android.com> Merge "AtPhonebook handleCpbsCommand was incorrectly sending two responses to some requests (one inside the swtich statement, then repeating it after breaking out of the switch statement). This broke phonebook sync with Audi 2G MMI car kit. Signed-off-by: Nigel Hannam <nigel@hannam.eu>"
70bfe3280ce158c39dbb25fe18386f0d10b490d3 24-Sep-2013 Zhihai Xu <zhihaixu@google.com> Unable to receive Text Message to CAR Kit(nuvi3580LM)

The problem is when we receive the SetNotificationRegistration,
the MNS thread is not ready yet.so the notification is not enabled.
so we won't send new message notification to Carkit.

bug:10898884

Change-Id: Ibaa4a92694bcbb1ea2fb4e8a3de0ff30acdafeb1
rc/com/android/bluetooth/map/BluetoothMapObexServer.java
rc/com/android/bluetooth/map/BluetoothMapService.java
rc/com/android/bluetooth/map/BluetoothMnsObexClient.java
cf4f02a8fa144b476e0b60e4777d909fffbdcb40 26-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
87957f5cac4a84c9ff5c2fe97566c64e3de72959 26-Sep-2013 Zhihai Xu <zhihaixu@google.com> am c49801ad: am 17a2c2c2: Merge "bluetooth crash caused by read phone book with invalid colummn number -1" into klp-dev

* commit 'c49801ad7ced599b86f0c27bc8082deb4f7d449f':
bluetooth crash caused by read phone book with invalid colummn number -1
c49801ad7ced599b86f0c27bc8082deb4f7d449f 26-Sep-2013 Zhihai Xu <zhihaixu@google.com> am 17a2c2c2: Merge "bluetooth crash caused by read phone book with invalid colummn number -1" into klp-dev

* commit '17a2c2c2245ea7275c2380f352aaea22450585af':
bluetooth crash caused by read phone book with invalid colummn number -1
17a2c2c2245ea7275c2380f352aaea22450585af 25-Sep-2013 Zhihai Xu <zhihaixu@google.com> Merge "bluetooth crash caused by read phone book with invalid colummn number -1" into klp-dev
a54528ac870255cadf7181f876d19d3da9c70928 25-Sep-2013 Baligh Uddin <baligh@google.com> am 4af9e63e: (-s ours) am b3082d83: (-s ours) Import translations. DO NOT MERGE

* commit '4af9e63e7e9d713fbb47becbd8d692683eb9475c':
Import translations. DO NOT MERGE
4af9e63e7e9d713fbb47becbd8d692683eb9475c 25-Sep-2013 Baligh Uddin <baligh@google.com> am b3082d83: (-s ours) Import translations. DO NOT MERGE

* commit 'b3082d834a8fa65038e8ebdeff16cf0394bfb82c':
Import translations. DO NOT MERGE
b3082d834a8fa65038e8ebdeff16cf0394bfb82c 25-Sep-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Icd8a04f9f9c4d9564fa2dda13be067ce6cc868c8
Auto-generated-cl: translation import
es/values-iw/strings.xml
abf19e783556a93cfdd33468454a309ed347bfc4 25-Sep-2013 Zhihai Xu <zhihaixu@google.com> bluetooth crash caused by read phone book with invalid colummn number -1

bug:10919257
Change-Id: I584d5c5c65e26cacfab227742b98c49282710f68
rc/com/android/bluetooth/hfp/AtPhonebook.java
16cf079aa2b62fbdd19f645a6a98a759f250bb86 22-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
6d34abbcb1ea01a1c1af46908293120ea317af33 20-Sep-2013 Zhihai Xu <zhihaixu@google.com> am edfc77d9: am 107aa9c1: Merge "resource leakage in bluetooth MAP when empty message in phone." into klp-dev

* commit 'edfc77d95f6483ffcbf289cca2862be97a6f9578':
resource leakage in bluetooth MAP when empty message in phone.
edfc77d95f6483ffcbf289cca2862be97a6f9578 20-Sep-2013 Zhihai Xu <zhihaixu@google.com> am 107aa9c1: Merge "resource leakage in bluetooth MAP when empty message in phone." into klp-dev

* commit '107aa9c1c7928ff499a7147699b86920262e1562':
resource leakage in bluetooth MAP when empty message in phone.
107aa9c1c7928ff499a7147699b86920262e1562 20-Sep-2013 Zhihai Xu <zhihaixu@google.com> Merge "resource leakage in bluetooth MAP when empty message in phone." into klp-dev
946488ccde9906ef23f2b2f3faeedb60b55ef0e0 18-Sep-2013 Jean-Michel Trivi <jmtrivi@google.com> Add MEDIA_CONTENT_CONTROL permission

Required to register IRemoteControlDisplay implementation

b/8209392
Change-Id: Ide88e9a11bcfa68e7d5e2095208e63afdb5c511e
ndroidManifest.xml
a65f6bba8589b2bcac91b7e8c9f4fe5815640f0e 20-Sep-2013 Matthew Xie <mattx@google.com> am b0470436: am 788788cc: Merge "Check null condition of number before contact query" into klp-dev

* commit 'b0470436365bcf41641a7ee05dd825ffaecc81a5':
Check null condition of number before contact query
d3260e8898dbffcfc1d740671b0423e7994cafb0 20-Sep-2013 Jean-Michel Trivi <jmtrivi@google.com> am 0554fda9: am 5509d363: Add MEDIA_CONTENT_CONTROL permission

* commit '0554fda9f75eb8fcd3cc6936c89440a9b39f0176':
Add MEDIA_CONTENT_CONTROL permission
b0470436365bcf41641a7ee05dd825ffaecc81a5 20-Sep-2013 Matthew Xie <mattx@google.com> am 788788cc: Merge "Check null condition of number before contact query" into klp-dev

* commit '788788cc4a56eed314675314447c2ce240417233':
Check null condition of number before contact query
788788cc4a56eed314675314447c2ce240417233 20-Sep-2013 Matthew Xie <mattx@google.com> Merge "Check null condition of number before contact query" into klp-dev
0554fda9f75eb8fcd3cc6936c89440a9b39f0176 20-Sep-2013 Jean-Michel Trivi <jmtrivi@google.com> am 5509d363: Add MEDIA_CONTENT_CONTROL permission

* commit '5509d363f16f82c3fd56ee532e6de166cfd31d2c':
Add MEDIA_CONTENT_CONTROL permission
09b09c15dcd853d452b24d46a3c81ca63fa090ea 20-Sep-2013 Matthew Xie <mattx@google.com> Check null condition of number before contact query

bug 10571304

Change-Id: Idb23e7085dc1dc7119e0e2aa8901743707e72285
rc/com/android/bluetooth/hfp/AtPhonebook.java
5509d363f16f82c3fd56ee532e6de166cfd31d2c 18-Sep-2013 Jean-Michel Trivi <jmtrivi@google.com> Add MEDIA_CONTENT_CONTROL permission

Required to register IRemoteControlDisplay implementation

b/8209392
Change-Id: Ide88e9a11bcfa68e7d5e2095208e63afdb5c511e
ndroidManifest.xml
fac695e2dc25510b12684217d066b86dbbbba176 20-Sep-2013 Zhihai Xu <zhihaixu@google.com> resource leakage in bluetooth MAP when empty message in phone.

bug:10844044
Change-Id: I60c1b0206d7ba4653d149bee2f9f0dd6da6a5afb
rc/com/android/bluetooth/map/BluetoothMapContentObserver.java
fbd230ffdfd078d180a5deccb0dc8702e3cb4dfc 19-Sep-2013 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
246eea286a8c21613b105bfd8cd642533ac4b91c 19-Sep-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I3306595873722ce8c2d719e16830bf46a525385e
Auto-generated-cl: translation import
es/values-iw/strings.xml
76a79d70259afe661fcd451c5df265702e6660f8 19-Sep-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I0fe03862cdf48d56166df094d177f5d6c0212367
Auto-generated-cl: translation import
es/values-iw/strings.xml
179e64d8778f621178ff123eb61892476d9a8eea 18-Sep-2013 Matthew Xie <mattx@google.com> am 214dbd23: am 2e90040f: Change Volume step scale. Use setStreamVolume instead of avrcpUpdateVolume

* commit '214dbd23cc35fd908dd6df4dbc7132498611ac47':
Change Volume step scale. Use setStreamVolume instead of avrcpUpdateVolume
214dbd23cc35fd908dd6df4dbc7132498611ac47 18-Sep-2013 Matthew Xie <mattx@google.com> am 2e90040f: Change Volume step scale. Use setStreamVolume instead of avrcpUpdateVolume

* commit '2e90040ffc6f1c4cd5187338c9f708df4d380aee':
Change Volume step scale. Use setStreamVolume instead of avrcpUpdateVolume
2e90040ffc6f1c4cd5187338c9f708df4d380aee 12-Sep-2013 Matthew Xie <mattx@google.com> Change Volume step scale. Use setStreamVolume instead of avrcpUpdateVolume

bug 10681804

Change-Id: I553dac18d48c86bdb8b11428f56956f04ea87f27
rc/com/android/bluetooth/a2dp/Avrcp.java
c6445a3eefb2c173616d8153805169af7e5c2722 15-Sep-2013 Baligh Uddin <baligh@google.com> am 5616549d: (-s ours) am bae1f268: (-s ours) Import translations. DO NOT MERGE

* commit '5616549d284d157bd1f81b5aca247826d8bc6922':
Import translations. DO NOT MERGE
5616549d284d157bd1f81b5aca247826d8bc6922 15-Sep-2013 Baligh Uddin <baligh@google.com> am bae1f268: (-s ours) Import translations. DO NOT MERGE

* commit 'bae1f2683e6829767ee36c17bf1d4196e8ebeae1':
Import translations. DO NOT MERGE
bae1f2683e6829767ee36c17bf1d4196e8ebeae1 15-Sep-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I585f487a522776ee1c529309d359452233abed15
Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-de/strings.xml
es/values-en-rIN/strings.xml
es/values-en-rIN/strings_pbap.xml
es/values-en-rIN/test_strings.xml
es/values-et-rEE/strings.xml
es/values-et-rEE/strings_pbap.xml
es/values-et-rEE/test_strings.xml
es/values-fr-rCA/strings.xml
es/values-fr-rCA/strings_pbap.xml
es/values-fr-rCA/test_strings.xml
es/values-hi/strings.xml
es/values-hi/test_strings.xml
es/values-hy-rAM/strings.xml
es/values-hy-rAM/strings_pbap.xml
es/values-hy-rAM/test_strings.xml
es/values-ka-rGE/strings.xml
es/values-ka-rGE/strings_pbap.xml
es/values-ka-rGE/test_strings.xml
es/values-km-rKH/strings.xml
es/values-km-rKH/strings_pbap.xml
es/values-km-rKH/test_strings.xml
es/values-lo-rLA/strings.xml
es/values-lo-rLA/strings_pbap.xml
es/values-lo-rLA/test_strings.xml
es/values-mn-rMN/strings.xml
es/values-mn-rMN/strings_pbap.xml
es/values-mn-rMN/test_strings.xml
es/values-ms-rMY/strings.xml
es/values-ms-rMY/strings_pbap.xml
es/values-ms-rMY/test_strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-sw/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rHK/strings_pbap.xml
es/values-zh-rHK/test_strings.xml
fddf9f768cd626ff6894bceacdaa252931d7313e 14-Sep-2013 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
92c5ab59c242ab72dc87c569e24f7fa849d745ef 14-Sep-2013 Ying Wang <wangying@google.com> am f247002c: am d15002a6: Merge "Fix build." into klp-dev

* commit 'f247002c9b0cabd3176d04f8cba4b9387b99e950':
Fix build.
f247002c9b0cabd3176d04f8cba4b9387b99e950 14-Sep-2013 Ying Wang <wangying@google.com> am d15002a6: Merge "Fix build." into klp-dev

* commit 'd15002a607de29c0a42dca1afee1183132c664a4':
Fix build.
d15002a607de29c0a42dca1afee1183132c664a4 14-Sep-2013 Ying Wang <wangying@google.com> Merge "Fix build." into klp-dev
b42ddd9abf40e1f3e3c5a33fa67dea898adcb219 14-Sep-2013 Ying Wang <wangying@google.com> Fix build.

Change-Id: I02a9d4dfa84c5778a1136d39b7bb14a2e523a9ca
rc/com/android/bluetooth/map/BluetoothMapContent.java
rc/com/android/bluetooth/map/BluetoothMapbMessageMmsEmail.java
ests/src/com/android/bluetooth/tests/BluetoothMapContentTest.java
e034673a24bf769b021e7f8339f4b2f1648cbae2 14-Sep-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ic31fc910d37105f08f4855c3fb501bc8605b3321
Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-de/strings.xml
es/values-hi/strings.xml
es/values-pt-rPT/strings.xml
es/values-sw/strings.xml
078569222c965d3d5677551b7eaa8c26d4345889 14-Sep-2013 Guang Zhu <guangzhu@google.com> am a104c709: am ce0e5037: disable broken tests

* commit 'a104c709de5bc8c951fb4715933ce5978e67fecf':
disable broken tests
a104c709de5bc8c951fb4715933ce5978e67fecf 14-Sep-2013 Guang Zhu <guangzhu@google.com> am ce0e5037: disable broken tests

* commit 'ce0e503769f375858b2794976d7b89677b4c0c28':
disable broken tests
ce0e503769f375858b2794976d7b89677b4c0c28 14-Sep-2013 Guang Zhu <guangzhu@google.com> disable broken tests

tests are causing build breakage

Bug: 10692365

Change-Id: Ieb4b8c6946cf2de4230f1320d940c89de53b100c
ests/Android.mk
91101e47076a02b291b9bf3948551cc7f722b773 14-Sep-2013 Zhihai Xu <zhihaixu@google.com> am 7452f9d7: am f32e3965: Merge "Fixes to the google review comments + spec 1.1" into klp-dev

* commit '7452f9d7996b2f540e08f19801aa11ed6d5f60db':
Fixes to the google review comments + spec 1.1
7452f9d7996b2f540e08f19801aa11ed6d5f60db 14-Sep-2013 Zhihai Xu <zhihaixu@google.com> am f32e3965: Merge "Fixes to the google review comments + spec 1.1" into klp-dev

* commit 'f32e39656b9250c22e0b5b99676f382b99b135a3':
Fixes to the google review comments + spec 1.1
f32e39656b9250c22e0b5b99676f382b99b135a3 14-Sep-2013 Zhihai Xu <zhihaixu@google.com> Merge "Fixes to the google review comments + spec 1.1" into klp-dev
70be005a18a35ec5fcb46152f0dfbe82156efa3a 22-Aug-2013 Kim Schulz <k.schulz@samsung.com> Fixes to the google review comments + spec 1.1

- updated code to comply with MAP spec 1.1
- removed activity + strings.xml
- removed unused notification code
- fixed TODOs
- added more string validation and case insensitivity
- fixed internal+google review comments
- Added dump of incoming bMessages to /sdcard/bluetooth/log when verbose debug in enabled. Only the latest received message will be stored
- Fix functions msgListingSize and msgListingHasUnread to also consider mms filter message type
- Fix wrong tag length define for notification status parameter
- Re-added shutdown code to interupt the MNS
- removed map activity
- Added initial bluetooth map unit tests
- Fix map event report xml start tag to uppercase 'MAP'
- added support for using ProfileService class
- changed the way the Broadcast Receiver was implemented
- Fixed minor bugs found during Automotive Test Event
- FilterPeriod application parameters can be present, but with zero length
- For MMS the end-boundary were added too early
- The FOLDER entry in bMessage can be empty for a message push
- Wrong error value returned for a set status operation with a wrong handle
- In getMessage() exclude all binary content and smil.xml if the appParam attachment is set to "no".
- Set correct content id and content location for mms. Fix mms mime parser bug.
- moved disconnect to Handler thread
- fixed multipart-message split bug.
- added a few Unit tests for multi-part messages
- MMS parser optimized
- fixed exception in MNS obex Client
- fixed problem with Native PDUs not getting correct timestamp
- corrected mixup in ordinator/recipient for MMS

Change-Id: I3875762822a7f8ce0132065e0da5d0257e3850a1
Bug:10692365
ndroidManifest.xml
es/values/strings_map.xml
rc/com/android/bluetooth/btservice/Config.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/map/BluetoothMapActivity.java
rc/com/android/bluetooth/map/BluetoothMapAppParams.java
rc/com/android/bluetooth/map/BluetoothMapAuthenticator.java
rc/com/android/bluetooth/map/BluetoothMapContent.java
rc/com/android/bluetooth/map/BluetoothMapContentObserver.java
rc/com/android/bluetooth/map/BluetoothMapMessageListing.java
rc/com/android/bluetooth/map/BluetoothMapMessageListingElement.java
rc/com/android/bluetooth/map/BluetoothMapObexServer.java
rc/com/android/bluetooth/map/BluetoothMapReceiver.java
rc/com/android/bluetooth/map/BluetoothMapService.java
rc/com/android/bluetooth/map/BluetoothMapSmsPdu.java
rc/com/android/bluetooth/map/BluetoothMapbMessage.java
rc/com/android/bluetooth/map/BluetoothMapbMessageMmsEmail.java
rc/com/android/bluetooth/map/BluetoothMapbMessageSms.java
rc/com/android/bluetooth/map/BluetoothMnsObexClient.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
ests/Android.mk
ests/AndroidManifest.xml
ests/src/com/android/bluetooth/tests/BluetoothMapContentTest.java
ests/src/com/android/bluetooth/tests/BluetoothMapbMessageTest.java
c3698835d9e117740b35ae220abb083aab5162fa 12-Sep-2013 Ruben Brunk <rubenbrunk@google.com> am fcbc1ea2: am dc8c533e: Remove dependency on JNIHelp header side effects.

* commit 'fcbc1ea29053da89180619c866d729861ea2da31':
Remove dependency on JNIHelp header side effects.
fcbc1ea29053da89180619c866d729861ea2da31 12-Sep-2013 Ruben Brunk <rubenbrunk@google.com> am dc8c533e: Remove dependency on JNIHelp header side effects.

* commit 'dc8c533e030e6b8625da3dc75c8f768a3242fe16':
Remove dependency on JNIHelp header side effects.
dc8c533e030e6b8625da3dc75c8f768a3242fe16 11-Sep-2013 Ruben Brunk <rubenbrunk@google.com> Remove dependency on JNIHelp header side effects.

Bug: 10680559
Change-Id: If5c6e22dd89a41886bb72303a85ca674c60d1946
ni/com_android_bluetooth_btservice_AdapterService.cpp
a32534309406dc505179c00a5a823555505cb834 06-Sep-2013 John Du <johnldu@google.com> am 656cc101: am cd34ad74: Stop scan when client binder dies

* commit '656cc101040dd36cfe7b167a13a0744993855126':
Stop scan when client binder dies
656cc101040dd36cfe7b167a13a0744993855126 06-Sep-2013 John Du <johnldu@google.com> am cd34ad74: Stop scan when client binder dies

* commit 'cd34ad74f093c4867e616ba247fe3853b06afebc':
Stop scan when client binder dies
cd34ad74f093c4867e616ba247fe3853b06afebc 16-Aug-2013 John Du <johnldu@google.com> Stop scan when client binder dies

bug 10213756
Change-Id: I01b397070f729df7c6000c2dc2613efbe8801681
(cherry picked from commit 45ba247afa1cb3c61a871b0c13f6546411afe68b)
rc/com/android/bluetooth/gatt/GattService.java
f66671670194d0d222f439119f2ae033ce503d33 04-Sep-2013 Baligh Uddin <baligh@google.com> am 40c35139: (-s ours) am 70ddb0d7: (-s ours) Import translations. DO NOT MERGE

* commit '40c35139c295f986573b2941d6c499767a4bcdb7':
Import translations. DO NOT MERGE
40c35139c295f986573b2941d6c499767a4bcdb7 04-Sep-2013 Baligh Uddin <baligh@google.com> am 70ddb0d7: (-s ours) Import translations. DO NOT MERGE

* commit '70ddb0d79c784b3fb84c03a71537521f35688793':
Import translations. DO NOT MERGE
70ddb0d79c784b3fb84c03a71537521f35688793 03-Sep-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I134988fe16520246474f92a6f7b035e30d0b6afb
Auto-generated-cl: translation import
es/values-az-rAZ/strings_map.xml
es/values-mn-rMN/strings_map.xml
3e42150016fadb6785f4ddc5b500c2d7059718c2 29-Aug-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I842beaa9cd0b4d41bac5ff264b5eea67ba2ff574
Auto-generated-cl: translation import
es/values-az-rAZ/strings.xml
es/values-az-rAZ/strings_map.xml
es/values-az-rAZ/strings_pbap.xml
es/values-az-rAZ/test_strings.xml
es/values-hi/strings.xml
es/values-hi/test_strings.xml
es/values-mn-rMN/strings.xml
es/values-mn-rMN/strings_map.xml
es/values-mn-rMN/strings_pbap.xml
es/values-mn-rMN/test_strings.xml
es/values-ro/strings.xml
00dbbf37193d951a9c546c059e4e95534eca4787 28-Aug-2013 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
ab41da770a736ee67a8f0b2e6d70e4ea4ab904a9 27-Aug-2013 Edward Jee <edjee@google.com> am 65603e61: am b65328f1: Merge "Enables AT+ANDROID command in Bluetooth HFP." into klp-dev

* commit '65603e61f17f4d61528525463aa32bc3604d8bb3':
Enables AT+ANDROID command in Bluetooth HFP.
65603e61f17f4d61528525463aa32bc3604d8bb3 27-Aug-2013 Edward Jee <edjee@google.com> am b65328f1: Merge "Enables AT+ANDROID command in Bluetooth HFP." into klp-dev

* commit 'b65328f18100546c606026f8323a2da11af3edbc':
Enables AT+ANDROID command in Bluetooth HFP.
b65328f18100546c606026f8323a2da11af3edbc 26-Aug-2013 Edward Jee <edjee@google.com> Merge "Enables AT+ANDROID command in Bluetooth HFP." into klp-dev
ff833ce646e50c3593a313cd6a0be53577e41112 10-Apr-2013 Thomas Lehaux <thomasx.lehaux@intel.com> Add null pointer check in A2DPService

A call to the stop() function in A2DPService.java
could cause a NullPointerException in certain events.
This patch adds a null pointer check before a
function call to avoid this issue.

Change-Id: I39b521592d9cc5b910c5ce232d0d8d03389a0391
Orig-Change-Id: I77ee8129c3d81230afc5b59b4cc29e690cbe547a
Author: Thomas Lehaux <thomasx.lehaux@intel.com>
Reviewed-on: http://android.intel.com:8080/102211
Reviewed-by: Poignet, Cedric <cedric.poignet@intel.com>
Reviewed-by: cactus <cactus@intel.com>
Reviewed-by: Bondier, CedricX <cedricx.bondier@intel.com>
Reviewed-by: Boniface, XavierX <xavierx.boniface@intel.com>
Tested-by: Zurmely, PierreX <pierrex.zurmely@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Signed-off-by: Jian Luo <jian.luo@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 85837
rc/com/android/bluetooth/a2dp/A2dpService.java
bbe83cd994b3cb99b060a56d92c0aaef2e1088ef 26-Aug-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I28b2eca8278349757554f0dbef4a56d916f08cd0
Auto-generated-cl: translation import
es/values-et-rEE/strings.xml
es/values-et-rEE/strings_map.xml
es/values-et-rEE/strings_pbap.xml
es/values-et-rEE/test_strings.xml
es/values-hy-rAM/strings.xml
es/values-hy-rAM/strings_map.xml
es/values-hy-rAM/strings_pbap.xml
es/values-hy-rAM/test_strings.xml
es/values-ka-rGE/strings.xml
es/values-ka-rGE/strings_map.xml
es/values-ka-rGE/strings_pbap.xml
es/values-ka-rGE/test_strings.xml
es/values-km-rKH/strings.xml
es/values-km-rKH/strings_map.xml
es/values-km-rKH/strings_pbap.xml
es/values-km-rKH/test_strings.xml
es/values-lo-rLA/strings.xml
es/values-lo-rLA/strings_map.xml
es/values-lo-rLA/strings_pbap.xml
es/values-lo-rLA/test_strings.xml
es/values-ms-rMY/strings.xml
es/values-ms-rMY/strings_map.xml
es/values-ms-rMY/strings_pbap.xml
es/values-ms-rMY/test_strings.xml
es/values-ne-rNP/strings.xml
es/values-ne-rNP/strings_map.xml
es/values-ne-rNP/strings_pbap.xml
es/values-ne-rNP/test_strings.xml
es/values-si-rLK/strings.xml
es/values-si-rLK/strings_map.xml
es/values-si-rLK/strings_pbap.xml
es/values-si-rLK/test_strings.xml
d6be95fc97673779d4b17ab6c59db1b57750b796 23-Aug-2013 Baligh Uddin <baligh@google.com> am 6b50743e: (-s ours) am 9f5c7c6e: (-s ours) Import translations. DO NOT MERGE

* commit '6b50743e869c263d3c223d405608eb0cefbcecbf':
Import translations. DO NOT MERGE
6b50743e869c263d3c223d405608eb0cefbcecbf 23-Aug-2013 Baligh Uddin <baligh@google.com> am 9f5c7c6e: (-s ours) Import translations. DO NOT MERGE

* commit '9f5c7c6ed2a50148049656ec79cd945ce8c04fbf':
Import translations. DO NOT MERGE
9f5c7c6ed2a50148049656ec79cd945ce8c04fbf 23-Aug-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I0cccc9b44a66829a7f781986c6aee97c8744d17e
Auto-generated-cl: translation import
es/values-et-rEE/strings_map.xml
es/values-hy-rAM/strings_map.xml
es/values-ka-rGE/strings_map.xml
es/values-km-rKH/strings_map.xml
es/values-lo-rLA/strings_map.xml
es/values-ms-rMY/strings_map.xml
es/values-ne-rNP/strings_map.xml
es/values-si-rLK/strings_map.xml
cdc8ec8d84c7f16b851238da0d80b51335c4ea07 16-Aug-2013 Edward Jee <edjee@google.com> Enables AT+ANDROID command in Bluetooth HFP.

Adds another vendor-specific command AT+ANDROID in Bluetooth Hands-Free
Profile. And creates an API function that sends an unsolicited result
code +ANDROID .

Bug: 8736189
Change-Id: I7e5bba8a568f596565a1531948061e4d2fe456e0
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
f95a6adb58ff4680d291548c84453b8adeb8a14f 19-Aug-2013 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
ab087a70cdee7a239dfe9900ae757768cc8472a6 19-Aug-2013 Baligh Uddin <baligh@google.com> am 355b1675: (-s ours) am 09360264: (-s ours) Import translations. DO NOT MERGE

* commit '355b16752708096054de7a8d5092a5e80a7a175b':
Import translations. DO NOT MERGE
355b16752708096054de7a8d5092a5e80a7a175b 19-Aug-2013 Baligh Uddin <baligh@google.com> am 09360264: (-s ours) Import translations. DO NOT MERGE

* commit '09360264f212768c828ed8fc5051cd4d3ec1b381':
Import translations. DO NOT MERGE
f11785e14b15fbaed9e07185ee475fb3b168c496 19-Aug-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Iccfb0e191d4bbc648b6b3feb3549168f8635633a
Auto-generated-cl: translation import
es/values-az/strings.xml
es/values-az/strings_map.xml
es/values-az/strings_pbap.xml
es/values-az/test_strings.xml
es/values-en-rIN/strings.xml
es/values-en-rIN/strings_map.xml
es/values-en-rIN/strings_pbap.xml
es/values-en-rIN/test_strings.xml
es/values-fa/strings_map.xml
es/values-fr-rCA/strings.xml
es/values-fr-rCA/strings_map.xml
es/values-fr-rCA/strings_pbap.xml
es/values-fr-rCA/test_strings.xml
es/values-hy/strings.xml
es/values-hy/strings_map.xml
es/values-hy/strings_pbap.xml
es/values-hy/test_strings.xml
es/values-ka/strings.xml
es/values-ka/strings_map.xml
es/values-ka/strings_pbap.xml
es/values-ka/test_strings.xml
es/values-km/strings.xml
es/values-km/strings_map.xml
es/values-km/strings_pbap.xml
es/values-km/test_strings.xml
es/values-lo/strings.xml
es/values-lo/strings_map.xml
es/values-lo/strings_pbap.xml
es/values-lo/test_strings.xml
es/values-mn/strings.xml
es/values-mn/strings_map.xml
es/values-mn/strings_pbap.xml
es/values-mn/test_strings.xml
es/values-ne/strings.xml
es/values-ne/strings_map.xml
es/values-ne/strings_pbap.xml
es/values-ne/test_strings.xml
es/values-si/strings.xml
es/values-si/strings_map.xml
es/values-si/strings_pbap.xml
es/values-si/test_strings.xml
es/values-vi/strings_map.xml
es/values-zh-rHK/strings.xml
es/values-zh-rHK/strings_map.xml
es/values-zh-rHK/strings_pbap.xml
es/values-zh-rHK/test_strings.xml
09360264f212768c828ed8fc5051cd4d3ec1b381 19-Aug-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ie4e94f0caf464133c4fb2e3c993d066ceeb8edb3
Auto-generated-cl: translation import
es/values-az/strings_map.xml
es/values-en-rIN/strings_map.xml
es/values-fa/strings_map.xml
es/values-fr-rCA/strings_map.xml
es/values-hy/strings_map.xml
es/values-ka/strings_map.xml
es/values-km/strings_map.xml
es/values-lo/strings_map.xml
es/values-mn/strings_map.xml
es/values-ne/strings_map.xml
es/values-si/strings_map.xml
es/values-vi/strings_map.xml
es/values-zh-rHK/strings_map.xml
1dd1958b9dd3e4affea567e8b6cd8aeeebde3682 18-Aug-2013 John Du <johnldu@google.com> am 8590c06d: am 17675906: Adding support for Absolute Volume

* commit '8590c06d61c479a6f4c2b97f9c2f2ff44f53efc1':
Adding support for Absolute Volume
8590c06d61c479a6f4c2b97f9c2f2ff44f53efc1 18-Aug-2013 John Du <johnldu@google.com> am 17675906: Adding support for Absolute Volume

* commit '17675906064bb72fdcca75baa56cdf8bb8968d01':
Adding support for Absolute Volume
17675906064bb72fdcca75baa56cdf8bb8968d01 19-Jul-2013 John Du <johnldu@google.com> Adding support for Absolute Volume

Change-Id: Ie2ccaad7aaf56a89fe44b168026df3d84b373c06

Conflicts:
jni/com_android_bluetooth_avrcp.cpp
src/com/android/bluetooth/a2dp/Avrcp.java
ni/com_android_bluetooth_avrcp.cpp
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/Avrcp.java
e6849cb3a64ea2930f1f46715636c0ac1ebb6207 16-Aug-2013 Baligh Uddin <baligh@google.com> am 325a7945: (-s ours) am e606cba8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '325a79451b23a35fd10bf1bba0498bf5c39d46d7':
Import translations. DO NOT MERGE
325a79451b23a35fd10bf1bba0498bf5c39d46d7 16-Aug-2013 Baligh Uddin <baligh@google.com> am e606cba8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'e606cba88423e5fbfe651b12c2ae2d6c1d48df56':
Import translations. DO NOT MERGE
9d4a6591a9421af5ae569bee16382ac6b5cbeac0 16-Aug-2013 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
e606cba88423e5fbfe651b12c2ae2d6c1d48df56 16-Aug-2013 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into klp-dev
e76c03a14ff39f58db321bd57d4421a395fae5c1 15-Aug-2013 John Du <johnldu@google.com> am 19f42efd: am ace834fe: Add support for ff/rew

* commit '19f42efdcf833205a038f874c4197adb5a8cc27a':
Add support for ff/rew
19f42efdcf833205a038f874c4197adb5a8cc27a 15-Aug-2013 John Du <johnldu@google.com> am ace834fe: Add support for ff/rew

* commit 'ace834feb02adabd61f628c4471147aea02d939c':
Add support for ff/rew
ace834feb02adabd61f628c4471147aea02d939c 28-Jun-2013 John Du <johnldu@google.com> Add support for ff/rew

Change-Id: I7ec60d94313b9ba5e4e8e62c82f19ae332b6fdd3
(cherry picked from commit 55123eff985f4d15ec198569a5db895ea086447a)
ni/com_android_bluetooth_avrcp.cpp
rc/com/android/bluetooth/a2dp/Avrcp.java
bb384634c40e0f82c90897d399bb6277a315e33c 14-Aug-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I3fc1b74391ffff7c1244225cad47868a884cfbd7
Auto-generated-cl: translation import
es/values-af/strings_map.xml
es/values-am/strings_map.xml
es/values-bg/strings_map.xml
es/values-ca/strings_map.xml
es/values-cs/strings_map.xml
es/values-da/strings_map.xml
es/values-de/strings_map.xml
es/values-el/strings_map.xml
es/values-es-rUS/strings_map.xml
es/values-es/strings_map.xml
es/values-et/strings_map.xml
es/values-fi/strings_map.xml
es/values-fr/strings_map.xml
es/values-hi/strings_map.xml
es/values-hr/strings_map.xml
es/values-hu/strings_map.xml
es/values-in/strings_map.xml
es/values-it/strings_map.xml
es/values-iw/strings_map.xml
es/values-ja/strings_map.xml
es/values-ko/strings_map.xml
es/values-lt/strings_map.xml
es/values-lv/strings_map.xml
es/values-ms/strings_map.xml
es/values-nb/strings_map.xml
es/values-nl/strings_map.xml
es/values-pl/strings_map.xml
es/values-pt-rPT/strings_map.xml
es/values-pt/strings_map.xml
es/values-ro/strings_map.xml
es/values-ru/strings_map.xml
es/values-sk/strings_map.xml
es/values-sl/strings_map.xml
es/values-sr/strings_map.xml
es/values-sv/strings_map.xml
es/values-sw/strings_map.xml
es/values-th/strings_map.xml
es/values-tl/strings_map.xml
es/values-tr/strings_map.xml
es/values-uk/strings_map.xml
es/values-vi/strings_map.xml
es/values-zh-rCN/strings_map.xml
es/values-zh-rTW/strings_map.xml
es/values-zu/strings_map.xml
ba1eddf578dea9f6abdf582dacdcce57dc027496 14-Aug-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: If4f19d104c3f906156a4470e4a8cc3d1e5d07c2c
Auto-generated-cl: translation import
es/values-af/strings_map.xml
es/values-am/strings_map.xml
es/values-bg/strings_map.xml
es/values-ca/strings_map.xml
es/values-cs/strings_map.xml
es/values-da/strings_map.xml
es/values-de/strings_map.xml
es/values-el/strings_map.xml
es/values-es-rUS/strings_map.xml
es/values-es/strings_map.xml
es/values-et/strings_map.xml
es/values-fi/strings_map.xml
es/values-fr/strings_map.xml
es/values-hi/strings_map.xml
es/values-hr/strings_map.xml
es/values-hu/strings_map.xml
es/values-in/strings_map.xml
es/values-it/strings_map.xml
es/values-iw/strings_map.xml
es/values-ja/strings_map.xml
es/values-ko/strings_map.xml
es/values-lt/strings_map.xml
es/values-lv/strings_map.xml
es/values-ms/strings_map.xml
es/values-nb/strings_map.xml
es/values-nl/strings_map.xml
es/values-pl/strings_map.xml
es/values-pt-rPT/strings_map.xml
es/values-pt/strings_map.xml
es/values-ro/strings_map.xml
es/values-ru/strings_map.xml
es/values-sk/strings_map.xml
es/values-sl/strings_map.xml
es/values-sr/strings_map.xml
es/values-sv/strings_map.xml
es/values-sw/strings_map.xml
es/values-th/strings_map.xml
es/values-tl/strings_map.xml
es/values-tr/strings_map.xml
es/values-uk/strings_map.xml
es/values-vi/strings_map.xml
es/values-zh-rCN/strings_map.xml
es/values-zh-rTW/strings_map.xml
es/values-zu/strings_map.xml
f8a5f66387c1f00a85432eb80590ac8f5876f43d 14-Aug-2013 Matthew Xie <mattx@google.com> am 9bd442f8: am 8c85057a: Merge "LE: Add peripheral role support (4/4)" into klp-dev

* commit '9bd442f8df026b1bb6748e24824f9d63b2246893':
LE: Add peripheral role support (4/4)
f684b58b64bed924d317c79a7ee3e9ef49eb1813 14-Aug-2013 Matthew Xie <mattx@google.com> am 5d3a29cb: am 59f7aee8: Merge "LE: Add instance ID to descriptors (4/4)" into klp-dev

* commit '5d3a29cb773a7243791f9917f3e8e8a1ac65e975':
LE: Add instance ID to descriptors (4/4)
9bd442f8df026b1bb6748e24824f9d63b2246893 14-Aug-2013 Matthew Xie <mattx@google.com> am 8c85057a: Merge "LE: Add peripheral role support (4/4)" into klp-dev

* commit '8c85057a003441674807e2991092735011c72b26':
LE: Add peripheral role support (4/4)
5d3a29cb773a7243791f9917f3e8e8a1ac65e975 14-Aug-2013 Matthew Xie <mattx@google.com> am 59f7aee8: Merge "LE: Add instance ID to descriptors (4/4)" into klp-dev

* commit '59f7aee85186fa07fc29ea941cfdab99e7c87d91':
LE: Add instance ID to descriptors (4/4)
8c85057a003441674807e2991092735011c72b26 14-Aug-2013 Matthew Xie <mattx@google.com> Merge "LE: Add peripheral role support (4/4)" into klp-dev
97d5a00d3d588f89b36be801461455a2ab625907 07-Aug-2013 Andre Eisenbach <andre@broadcom.com> LE: Add peripheral role support (4/4)

Initial stack support for the LE peripheral role.

Change-Id: I3600558fd777999bcd610fa3aaed259414702ea4
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
59f7aee85186fa07fc29ea941cfdab99e7c87d91 14-Aug-2013 Matthew Xie <mattx@google.com> Merge "LE: Add instance ID to descriptors (4/4)" into klp-dev
7f9efa4413d64569cd8a25ef2262778505059d80 09-Jul-2013 Andre Eisenbach <andre@broadcom.com> LE: Add instance ID to descriptors (4/4)

If a remote devices offers multiple descriptors with the same UUID, the
instance ID is used to differentiate between them.

Change-Id: I176dcfe1dc582120173cf3bd2d4329d7d764e39a
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
3867f32f12a148b6563a25750e97005e282d60f3 13-Aug-2013 Baligh Uddin <baligh@google.com> am 0dac1504: (-s ours) am e76ce140: (-s ours) Import translations. DO NOT MERGE

* commit '0dac150402dd11f80f71a230b20e5a82accc1927':
Import translations. DO NOT MERGE
0dac150402dd11f80f71a230b20e5a82accc1927 13-Aug-2013 Baligh Uddin <baligh@google.com> am e76ce140: (-s ours) Import translations. DO NOT MERGE

* commit 'e76ce140acd95cff140d9b01886ef6018e82e1b9':
Import translations. DO NOT MERGE
67e3e5ee2ba8ead98c0ed7b1124ae9295b778226 12-Aug-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ic2698701b867e9edb83b48d5b5367d970aadda2e
Auto-generated-cl: translation import
es/values-af/strings_map.xml
es/values-ar/strings_map.xml
es/values-en-rGB/strings_map.xml
es/values-fa/strings_map.xml
e76ce140acd95cff140d9b01886ef6018e82e1b9 12-Aug-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I13faa9f5838b1d36fba572c47272703ae944c535
Auto-generated-cl: translation import
es/values-af/strings_map.xml
es/values-ar/strings_map.xml
es/values-en-rGB/strings_map.xml
es/values-fa/strings_map.xml
fd6603b8bf9ed72dcc8bd59aaef3209251b6e17c 19-Jul-2013 Matthew Xie <mattx@google.com> Bluetooth MAP profile - sms and mms support initial check-in

bug:10116530

Change-Id: If9ce878d71c1e1b12416014c433da03b3033e158
ndroid.mk
ndroidManifest.xml
es/values/config.xml
es/values/strings_map.xml
rc/com/android/bluetooth/map/BluetoothMapActivity.java
rc/com/android/bluetooth/map/BluetoothMapAppParams.java
rc/com/android/bluetooth/map/BluetoothMapAuthenticator.java
rc/com/android/bluetooth/map/BluetoothMapContent.java
rc/com/android/bluetooth/map/BluetoothMapContentObserver.java
rc/com/android/bluetooth/map/BluetoothMapFolderElement.java
rc/com/android/bluetooth/map/BluetoothMapMessageListing.java
rc/com/android/bluetooth/map/BluetoothMapMessageListingElement.java
rc/com/android/bluetooth/map/BluetoothMapObexServer.java
rc/com/android/bluetooth/map/BluetoothMapReceiver.java
rc/com/android/bluetooth/map/BluetoothMapRfcommTransport.java
rc/com/android/bluetooth/map/BluetoothMapService.java
rc/com/android/bluetooth/map/BluetoothMapSmsPdu.java
rc/com/android/bluetooth/map/BluetoothMapUtils.java
rc/com/android/bluetooth/map/BluetoothMapbMessage.java
rc/com/android/bluetooth/map/BluetoothMapbMessageMmsEmail.java
rc/com/android/bluetooth/map/BluetoothMapbMessageSms.java
rc/com/android/bluetooth/map/BluetoothMnsObexClient.java
rc/com/android/bluetooth/map/BluetoothMnsRfcommTransport.java
bb1ac417208c8e283f9b5b49f4413856500ed0f9 05-Aug-2013 Dianne Hackborn <hackbod@google.com> Use explicit Intent for binding to service.

Change-Id: I51971a02532ad0ad8fafb0529e7adf83ed846cf4
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
92595a8f2103955aa9a6d43c578459bae82e4f59 31-Jul-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I047f7faa69a457bc442be97e59ef0cf84d04a738
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
c0b728adc379712af2a4e2357d82b492745f5e58 31-Jul-2013 Matthew Xie <mattx@google.com> enable xml format to transfer/receive over bluetooth

Add proper MIME types for xml as text/xml.
bug 9170384

Change-Id: Idd23c4fe26e1d82b2ea1deb51acfeeb61c1634aa
ndroidManifest.xml
rc/com/android/bluetooth/opp/Constants.java
138a7c288f5828f5d06ccd971262327a82967228 26-Jul-2013 Zhihai Xu <zhihaixu@google.com> Merge "Add debug menu to enable btsnoop"
9674eb043aeb1474aa23ddd0739e3b8f05432630 10-Jun-2013 Jay Shrauner <shrauner@google.com> Use new CallLog number presentation column

Switch to using new number presentation column in the CallLog table.

Bug:6948882
Change-Id: I5df2969465c19f2357dbbc3266315e020e30476e
rc/com/android/bluetooth/hfp/AtPhonebook.java
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
7ae5a9d9e9f2db317f42ec1fc203c565fd437c51 12-Jun-2013 The Android Open Source Project <initial-contribution@android.com> am ca70fd76: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'ca70fd763174361aa9ed25241f94d52f94ef6387':
ignore invlaid play position update from remote control client.
ca70fd763174361aa9ed25241f94d52f94ef6387 12-Jun-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: Ie1d9fd280ad0b593e75ce17c11e45d34cf6df4ab
cc746985de8552c0d3e1f8e327e21c3e73008d00 08-Jun-2013 Zhihai Xu <zhihaixu@google.com> ignore invlaid play position update from remote control client.

differentiate between applications that use
the new RemoteControlClient APIs to pass a playback position but
don't have one yet, and applications that use the legacy API and
will never pass a position.

bug:9294855
Change-Id: I015b9ded72497464352a9fbb6a605cedfffad373
rc/com/android/bluetooth/a2dp/Avrcp.java
4efee167e0a1daf750f4a466db716213c1189bb2 12-Jun-2013 Zhihai Xu <zhihaixu@google.com> am 7dc55aab: Merge "ignore invlaid play position update from remote control client." into jb-mr2-dev

* commit '7dc55aab7b1e53f784ffc75d1e7e28c0ee42bb0c':
ignore invlaid play position update from remote control client.
9d80b509f715a3c3f2ebd0de373d427fc31a6e6c 11-Jun-2013 Zhihai Xu <zhihaixu@google.com> Add debug menu to enable btsnoop

bug: 8059358
Change-Id: I2947b2b77955238410e2620489c2e0407ad8ae7b
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/btservice/AdapterService.java
7dc55aab7b1e53f784ffc75d1e7e28c0ee42bb0c 11-Jun-2013 Zhihai Xu <zhihaixu@google.com> Merge "ignore invlaid play position update from remote control client." into jb-mr2-dev
f56b7b37a156d9207074af80c156db5884bb8c08 08-Jun-2013 Zhihai Xu <zhihaixu@google.com> ignore invlaid play position update from remote control client.

differentiate between applications that use
the new RemoteControlClient APIs to pass a playback position but
don't have one yet, and applications that use the legacy API and
will never pass a position.

bug:9294855
Change-Id: I015b9ded72497464352a9fbb6a605cedfffad373
rc/com/android/bluetooth/a2dp/Avrcp.java
37d0dc03a85a8b4364b35c01561e4be9d21c3f54 31-May-2013 Matthew Xie <mattx@google.com> am 865b323b: Notify adapter state change from off to on when disable fails

* commit '865b323bb1d0aa9581a9b6a2f5ed96fc0ee70b23':
Notify adapter state change from off to on when disable fails
865b323bb1d0aa9581a9b6a2f5ed96fc0ee70b23 30-May-2013 Matthew Xie <mattx@google.com> Notify adapter state change from off to on when disable fails

So that the settings app would not stuck at turning-off state
User can retry turning off.
bug 9164641

Change-Id: I6ae6d80c97673b4e548b7b5ab47c51f968342060
rc/com/android/bluetooth/btservice/AdapterState.java
51954fe06c39291fcf67412a2ed81f017e4925d8 25-May-2013 Matthew Xie <mattx@google.com> am 3cedf3d5: Fix rssi handling as one of property change event

* commit '3cedf3d57aff20e1876a5b450f41b05e975cb8e0':
Fix rssi handling as one of property change event
3cedf3d57aff20e1876a5b450f41b05e975cb8e0 24-May-2013 Matthew Xie <mattx@google.com> Fix rssi handling as one of property change event

The rssi is encoded in one byte as int8_t in the stack.
JNI code copied in high byte without proper masking.
The converting is not needed. I am removing the uncessary converting.
bug 9110215

Change-Id: I50628b3a3c0bcf4a33775c6b62e9febd35bdc78d
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/btservice/RemoteDevices.java
de221fc5989b5793bd83a67c28fa82a58d9d1825 22-May-2013 Zhihai Xu <zhihaixu@google.com> am 0eea1282: Bluetooth Share has stopped / Secondary user setup / NullPointerException

* commit '0eea1282dcb425c1ea9dc6aa08d323884a9a1655':
Bluetooth Share has stopped / Secondary user setup / NullPointerException
0eea1282dcb425c1ea9dc6aa08d323884a9a1655 22-May-2013 Zhihai Xu <zhihaixu@google.com> Bluetooth Share has stopped / Secondary user setup / NullPointerException

issue 9066070

Change-Id: Ie206eab374c6a8c255f1a6302249f81ac16fc333
rc/com/android/bluetooth/btservice/AdapterState.java
c6671c58220cabf78ece05112da9b33a36621c65 15-May-2013 YK Jeffrey Chao <jechao@broadcom.com> am ad9fff21: Preload timeout and retry mechanism (2/3)

* commit 'ad9fff218081d2f49471487d37387c764d69ed29':
Preload timeout and retry mechanism (2/3)
fd0cb64aeb1f806a041a5881dd2ba846b0aa6a93 02-May-2013 Ravi Nagarajan <nravi@broadcom.com> Fix for roam indicator not updating correctly

Use telephony manager PhoneStateListener to update the roam indicator
bug 8781689

Change-Id: I7c06f162918a10d06d77fb302e99bd2db8b02874
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
ad9fff218081d2f49471487d37387c764d69ed29 24-Apr-2013 YK Jeffrey Chao <jechao@broadcom.com> Preload timeout and retry mechanism (2/3)

If the Preload process was stuck due to unknown hardware init failure,
a 8-second ENABLE_TIMEOUT timeout would be eventually expired in Java layer
at AdapterState and attempted to set BT state back to STATE_OFF.
However BluetoothManagerService did not handle this case accordingly and led
to state mis-matching between Java layer and BTIF at the end.

Add the processing logic in AdapterState to handle the case when an explicit
STATE_OFF notification from BTIF was received in the TurningOn Pending state.

bug 7566317

Change-Id: I29c379cd453d05297ed382a5e8f862fa7d0f8881
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/btservice/AdapterState.java
3fd932971c5ed449b4b8c20c68505850ca95712b 07-May-2013 Zhihai Xu <zhihaixu@google.com> am bad49957: avoid null pointer in handlePanDeviceStateChange of PanService

* commit 'bad4995703f97fab3c7c84b297a8ca6df65191fa':
avoid null pointer in handlePanDeviceStateChange of PanService
ab26df0179c9eada53b7229f53c8680d6e64ba0d 06-May-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I218327cf32cf3aab5b00182dedd2f0710be449d8
Auto-generated-cl: translation import
es/values-pt/strings.xml
bad4995703f97fab3c7c84b297a8ca6df65191fa 04-May-2013 Zhihai Xu <zhihaixu@google.com> avoid null pointer in handlePanDeviceStateChange of PanService

see the following null pointer exception
04-30 15:15:21.689 10890 10890 E AndroidRuntime: Caused by: java.lang.NullPointerException
04-30 15:15:21.689 10890 10890 E AndroidRuntime: at com.android.bluetooth.pan.PanService.handlePanDeviceStateChange(PanService.java:457)
which cause crash when disable BT
If the stop is called before the cleanup in PanService, Nullpointer may happen.

issue 8769031

Change-Id: Ia3fb1625c945c508771a697234e6ee18a120d72b
rc/com/android/bluetooth/pan/PanService.java
f57e509c2dd4dff47b5f1ce257a51fffa0307ab3 26-Apr-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I480cc9513c2fed68c0231395bb3626816f85919a
Auto-generated-cl: translation import
es/values-zh-rTW/test_strings.xml
8018d35d6d12db5986a13c15245cc21ad7e2e1d4 26-Apr-2013 Zhihai Xu <zhihaixu@google.com> am 00998973: Merge "Null pointer exception in SocketAcceptThread of BluetoothPbapService." into jb-mr2-dev

* commit '009989730a294575c32295976c57af169523abe4':
Null pointer exception in SocketAcceptThread of BluetoothPbapService.
009989730a294575c32295976c57af169523abe4 26-Apr-2013 Zhihai Xu <zhihaixu@google.com> Merge "Null pointer exception in SocketAcceptThread of BluetoothPbapService." into jb-mr2-dev
7b91a410d595b879548e540889f8b30a0d6476c4 23-Apr-2013 Zhihai Xu <zhihaixu@google.com> Null pointer exception in SocketAcceptThread of BluetoothPbapService.

issue 7650255

Change-Id: Ied5c4ba2b34ffef9edaaa1ad7d8b4a9a0e73ef90
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
5e6a1d38b99c597cfb77b9389e92259417705dea 25-Apr-2013 Matthew Xie <mattx@google.com> am 0592109a: Merge "Enforcing bluetooth permissions for GATT api calls" into jb-mr2-dev

* commit '0592109a75ca9e4e65489c04d6c5994cd7db45b2':
Enforcing bluetooth permissions for GATT api calls
0592109a75ca9e4e65489c04d6c5994cd7db45b2 25-Apr-2013 Matthew Xie <mattx@google.com> Merge "Enforcing bluetooth permissions for GATT api calls" into jb-mr2-dev
9e4a62e487bda885848771e4fa87717465bf75d2 25-Apr-2013 Matthew Xie <mattx@google.com> Enforcing bluetooth permissions for GATT api calls

bug 8667898

Change-Id: I2100d402f6496271bf97fed03684bedd8d231da4
rc/com/android/bluetooth/gatt/GattService.java
9487578c9431b662c6c9de9a6bedbfa9212a3aa6 24-Apr-2013 Priti Aghera <paghera@broadcom.com> am 86296657: HDP Single SDP fix

* commit '8629665794ef845e945595040e4cf1ea2fa508d3':
HDP Single SDP fix
8629665794ef845e945595040e4cf1ea2fa508d3 05-Apr-2013 Priti Aghera <paghera@broadcom.com> HDP Single SDP fix

Modified the stack logic to create single
SDP record for all register call.
bug 8656462
Change-Id: If06193aecbe7555e6b1402275ee243fcd672c812
rc/com/android/bluetooth/hdp/HealthService.java
d2753d0d51eb24c616bd11a81285445085e60425 24-Apr-2013 Zhihai Xu <zhihaixu@google.com> am db367aa8: enable playback position sync for AVRCP remoteControlDisplay in audio manager

* commit 'db367aa803836ca5b80da6b07ea2ef8a4b0ca1d2':
enable playback position sync for AVRCP remoteControlDisplay in audio manager
db367aa803836ca5b80da6b07ea2ef8a4b0ca1d2 23-Apr-2013 Zhihai Xu <zhihaixu@google.com> enable playback position sync for AVRCP remoteControlDisplay in audio manager

issue 8698103

Change-Id: I3572b519c4181b21629c812ba91e46d977ec33fe
rc/com/android/bluetooth/a2dp/Avrcp.java
eb447dcc33a37e5809cfabde513f7fa58c207800 18-Apr-2013 Priti Aghera <paghera@broadcom.com> am f60d96d6: Fixed a NPE

* commit 'f60d96d6bf4c3dce367ce48436f383897c7f9719':
Fixed a NPE
f60d96d6bf4c3dce367ce48436f383897c7f9719 15-Apr-2013 Priti Aghera <paghera@broadcom.com> Fixed a NPE

Bluetooth share was crashing due to NPE. Included a check for
Inputstream in BluetoothOppSendFileInfo.

bug #7924487
Change-Id: Iccceb607a46962f84538e912d62f407ad5ee2f21
rc/com/android/bluetooth/opp/BluetoothOppUtility.java
83b71705fcd5f430d0a1fc76c71f49c37d08f34d 18-Apr-2013 Andre Eisenbach <andre@broadcom.com> am dbaf9cd4: LE (3/3): Add application ID to connection callback

* commit 'dbaf9cd41555de7e6101f368ac348bbeb2094809':
LE (3/3): Add application ID to connection callback
8f00369377a49f879616b45014ff8bccc0a5ae3d 17-Apr-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Iad66487373a02c1e475ab0f0317e351040586c21
Auto-generated-cl: translation import
es/values-sw/strings.xml
dbaf9cd41555de7e6101f368ac348bbeb2094809 10-Apr-2013 Andre Eisenbach <andre@broadcom.com> LE (3/3): Add application ID to connection callback

Bug: 8589393
Change-Id: Iff14aa568bac4d62920bc35ec1545384e200b53a
ni/com_android_bluetooth_gatt.cpp
rc/com/android/bluetooth/gatt/GattService.java
d034060e1323476c33bdc140f21bb0e37c0e6720 12-Apr-2013 Zhihai Xu <zhihaixu@google.com> am 79d176b0: Resolve AVRCP IOP issues

* commit '79d176b0f3d6cb33c7e52be6641fd4808ba87e93':
Resolve AVRCP IOP issues
79d176b0f3d6cb33c7e52be6641fd4808ba87e93 12-Apr-2013 Zhihai Xu <zhihaixu@google.com> Resolve AVRCP IOP issues

This patch has the following fixes
1. Track number should be 0xFFFFFFFF when no track is currently selected
2. When no track is currently selected set play state as stopped
3. Track number sent in the correct byte order

issue 8586495

Change-Id: I2be583d1e87a39015dff605c7442ca658a10b2e2
rc/com/android/bluetooth/a2dp/Avrcp.java
6254387c5a8422a636608cb6e7f77ed1e99bb4b5 10-Apr-2013 Ying Wang <wangying@google.com> am 9311455a: Merge "Add liblog" into jb-mr2-dev

* commit '9311455ac6cc5c7aebe9d355e508c4af86da3246':
Add liblog
9311455ac6cc5c7aebe9d355e508c4af86da3246 10-Apr-2013 Ying Wang <wangying@google.com> Merge "Add liblog" into jb-mr2-dev
b4f89ed5a23c42ee8a80b79dab7b1c06cd1d70e0 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: I06b82e2424d63361364c223b1dd5b6006abe7ca8
ni/Android.mk
a14e6e3715db500e78690f636778c5b1cea172bc 10-Apr-2013 Zhihai Xu <zhihaixu@google.com> am aa1ffd5c: support playback position changed notification

* commit 'aa1ffd5c6bd4f016c6ed452b3551e65872eaea8e':
support playback position changed notification
aa1ffd5c6bd4f016c6ed452b3551e65872eaea8e 04-Apr-2013 Zhihai Xu <zhihaixu@google.com> support playback position changed notification

issue 8494369

Change-Id: Id468d34badac4c963d4e6df0e7e32bbd0c508938
ni/com_android_bluetooth_avrcp.cpp
rc/com/android/bluetooth/a2dp/Avrcp.java
227d7ea324072a6dfea5de5eaddfa066b5492d66 06-Apr-2013 Andre Eisenbach <andre@broadcom.com> am 6af1f250: Add binder DeathRecipient to GATT service

* commit '6af1f25031e4378efb1a4fc286974c1038a357ba':
Add binder DeathRecipient to GATT service
6af1f25031e4378efb1a4fc286974c1038a357ba 05-Apr-2013 Andre Eisenbach <andre@broadcom.com> Add binder DeathRecipient to GATT service

Bluetooth stack connections are now released if a GATT client or server
application closes unexpectedly.

Bug: 8362526
Change-Id: I13b0711f65dcc752f4ed5c5a6e469b6fea41de75
rc/com/android/bluetooth/gatt/ContextMap.java
rc/com/android/bluetooth/gatt/GattService.java
81a2206546949d0f9aeeb9c5eda55ef4c2c55e75 04-Apr-2013 Matthew Xie <mattx@google.com> am 4bcc3acd: Merge "Implement getRemoteType of IBluetooth.aidl" into jb-mr2-dev

* commit '4bcc3acd9b6024ac53c5de7af08ce56079f20e86':
Implement getRemoteType of IBluetooth.aidl
4bcc3acd9b6024ac53c5de7af08ce56079f20e86 04-Apr-2013 Matthew Xie <mattx@google.com> Merge "Implement getRemoteType of IBluetooth.aidl" into jb-mr2-dev
9f40b5ac8cf85364b280e72a3dd1c33994fc76d5 04-Apr-2013 Jean-Michel Trivi <jmtrivi@google.com> am 0c61ad1d: Merge "Update IRemoteControlDisplay implementation to latest interface" into jb-mr2-dev

* commit '0c61ad1d60fdf9738f9171acaa43f63a9a70d147':
Update IRemoteControlDisplay implementation to latest interface
0c61ad1d60fdf9738f9171acaa43f63a9a70d147 03-Apr-2013 Jean-Michel Trivi <jmtrivi@google.com> Merge "Update IRemoteControlDisplay implementation to latest interface" into jb-mr2-dev
d235269f06e99d76a0f63c8fe9e224e0f951f799 03-Apr-2013 Matthew Xie <mattx@google.com> Implement getRemoteType of IBluetooth.aidl

Bring the device type from hal to app api
bug 8529188

Change-Id: Id4a9837afc7234cb50ab6abf73da4bdc010db392
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
221ad4c5216738d4084f85c536a2390196d6beb8 02-Apr-2013 Zhihai Xu <zhihaixu@google.com> am bc10e7d5: keep one setPlaybackState function

* commit 'bc10e7d58aa55da25c18d8056a0254a2b736146a':
keep one setPlaybackState function
bc10e7d58aa55da25c18d8056a0254a2b736146a 02-Apr-2013 Zhihai Xu <zhihaixu@google.com> keep one setPlaybackState function

Change-Id: I4b6f4f17dadd542e890876a8b2fbf3c31badc003
rc/com/android/bluetooth/a2dp/Avrcp.java
93627064c68acfaef2da5deb2c9c9e73c7aa13af 01-Apr-2013 Jean-Michel Trivi <jmtrivi@google.com> Update IRemoteControlDisplay implementation to latest interface

Changed method setTransportControlFlags(int, int)
to method setTransportControlInfo(int, int, int)

Bug 8120740

Change-Id: I35833384102949eb2a20b0f61e13d9d8573adf3e
rc/com/android/bluetooth/a2dp/Avrcp.java
e5101a467fe2e5076d7cd7b3bee1870852660fff 31-Mar-2013 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
df4564f950f1b38c972fa18d1f6d062f7b495156 30-Mar-2013 Zhihai Xu <zhihaixu@google.com> am 6d5b7feb: fix compilation error for broadcom branch

* commit '6d5b7febd705a33ab41459743d12623afcbf96bd':
fix compilation error for broadcom branch
6d5b7febd705a33ab41459743d12623afcbf96bd 30-Mar-2013 Zhihai Xu <zhihaixu@google.com> fix compilation error for broadcom branch

Change-Id: I0ed2f039babccf59099c0c7cf0e3ad12392ecff4
rc/com/android/bluetooth/a2dp/Avrcp.java
240d3771eb2b29c64ae61c1c700d526c97e5f57d 30-Mar-2013 Zhihai Xu <zhihaixu@google.com> Merge "Revert "fix the compilation error""
cf98f178380679eb8af3f7099397396c17016fdf 30-Mar-2013 Zhihai Xu <zhihaixu@google.com> am c6a2fb9e: Revert "Revert "fix the compilation error in broadcom partner branch""

* commit 'c6a2fb9e324208a48173877c70b13f2f1b01286e':
Revert "Revert "fix the compilation error in broadcom partner branch""
d1ffc9f9daf63208afe8898f290074c362400cd4 30-Mar-2013 Zhihai Xu <zhihaixu@google.com> am 0e8131db: Revert "fix the compilation error in broadcom partner branch"

* commit '0e8131db9994d36b7cf9b61bfccb5fb374e09a19':
Revert "fix the compilation error in broadcom partner branch"
c6a2fb9e324208a48173877c70b13f2f1b01286e 30-Mar-2013 Zhihai Xu <zhihaixu@google.com> Revert "Revert "fix the compilation error in broadcom partner branch""

This reverts commit 0e8131db9994d36b7cf9b61bfccb5fb374e09a19

Change-Id: Id91d545d2884022ba8f021cb22d710f4ed421464
rc/com/android/bluetooth/a2dp/Avrcp.java
0e8131db9994d36b7cf9b61bfccb5fb374e09a19 30-Mar-2013 Zhihai Xu <zhihaixu@google.com> Revert "fix the compilation error in broadcom partner branch"

This reverts commit 9c55356d9405187302a50aa2f9de8b29976645e5

Change-Id: Ife672e4b012a7745abf9d8ba9701fc46a0008539
rc/com/android/bluetooth/a2dp/Avrcp.java
8cddf5fc337a80e6b03ca560673c476a3697ae65 30-Mar-2013 Zhihai Xu <zhihaixu@google.com> am 9c55356d: fix the compilation error in broadcom partner branch

* commit '9c55356d9405187302a50aa2f9de8b29976645e5':
fix the compilation error in broadcom partner branch
9c55356d9405187302a50aa2f9de8b29976645e5 30-Mar-2013 Zhihai Xu <zhihaixu@google.com> fix the compilation error in broadcom partner branch

Change-Id: I563742d29570095060c874b1b992cd1c3859dc58
rc/com/android/bluetooth/a2dp/Avrcp.java
c3b6eeff37d16329383400cd97f90f61a2f3a7df 30-Mar-2013 Zhihai Xu <zhihaixu@google.com> Revert "fix the compilation error"

This reverts commit ecde0072c36a719c95514ea069be5317e9306719

Change-Id: I79fdd720ac0ef20c2eb0ec1c17f129c743f113e3
rc/com/android/bluetooth/a2dp/Avrcp.java
ecde0072c36a719c95514ea069be5317e9306719 30-Mar-2013 Zhihai Xu <zhihaixu@google.com> fix the compilation error
rc/com/android/bluetooth/a2dp/Avrcp.java
5f6059e0d38418a1eeb8092896fb0e07f40e6bd8 30-Mar-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I9ffbeef7f3ca0ac573d2ca5ef0b50f6f1d4cecfd
Auto-generated-cl: translation import
es/values-sk/strings.xml
b22c41fab57ef358116bb5b5e6fefa86e9077bfd 29-Mar-2013 Brian Carlstrom <bdc@google.com> am 4f362dfe: resolved conflicts for merge of c508483d to jb-mr2-dev

* commit '4f362dfe593f4c8638873c3e7f9a53041bf3edd2':
Cleanup Bluetooth AdapterService JNI
8ddb0841a785c62e6a09060bcf1d7616c4a82979 29-Mar-2013 Jean-Michel Trivi <jmtrivi@google.com> am 252c3fd1: Merge "Update RemoteControlDisplay interface for playback position" into jb-mr2-dev

* commit '252c3fd10c9da267c6c2c7772025b92bf1ec74e9':
Update RemoteControlDisplay interface for playback position
4f362dfe593f4c8638873c3e7f9a53041bf3edd2 29-Mar-2013 Brian Carlstrom <bdc@google.com> resolved conflicts for merge of c508483d to jb-mr2-dev

Change-Id: I15a1f2b2391a973645ef14c36bb3ddf71c815bc9
252c3fd10c9da267c6c2c7772025b92bf1ec74e9 29-Mar-2013 Jean-Michel Trivi <jmtrivi@google.com> Merge "Update RemoteControlDisplay interface for playback position" into jb-mr2-dev
a6913f4c55f9adb8b7b2c8b6b1e12d92d287782b 28-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> am b5706272: Don\'t try using netd anymore.

* commit 'b57062726d787db9c40636a9b506870007676d7f':
Don't try using netd anymore.
b57062726d787db9c40636a9b506870007676d7f 11-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> Don't try using netd anymore.

Instead, form a connection with the NetworkStateTracker so
ConnectivityService can treat this like the other networks.

bug:8445208
Change-Id: Ice7dfb0b50c9481d359aed14a51372878185171c
rc/com/android/bluetooth/pan/PanService.java
283a6ab1325b0b9b74c80683ebb3ab76b2d8704d 26-Mar-2013 Zhihai Xu <zhihaixu@google.com> am 88521346: if the element attribute string is more than the maximum length, try to send partial attribute instead of empty attribute string .

* commit '885213461ae72d6db178c95fafc01cde153230db':
if the element attribute string is more than the maximum length, try to send partial attribute instead of empty attribute string .
885213461ae72d6db178c95fafc01cde153230db 26-Mar-2013 Zhihai Xu <zhihaixu@google.com> if the element attribute string is more than the maximum length, try to send partial attribute instead of empty attribute string .

issue 8470888

Change-Id: Ibfc3a25839bd07bd99dbb3328f56aad1d21720ea
ni/com_android_bluetooth_avrcp.cpp
eb8907e19ad3fa8208d7a65c8aae1bf758838705 22-Mar-2013 Jean-Michel Trivi <jmtrivi@google.com> Update RemoteControlDisplay interface for playback position

Update Avrcp class to latest IRemoteControlDisplay interface
that receives playback progress and playback speed.

bug 8120740

Change-Id: I7b30c5a312ab90ee8b1f45ad900efc7c941e133a
rc/com/android/bluetooth/a2dp/Avrcp.java
7289e7dc282319575fa83a501c0f7c8910031786 21-Mar-2013 Zhihai Xu <zhihaixu@google.com> am de06cdcc: Merge "framework support for new Bluetooth profiles AVRCP 1.3:Metadata and play status" into jb-mr2-dev

* commit 'de06cdccc4629cdfb12c16de226b3297377912e4':
framework support for new Bluetooth profiles AVRCP 1.3:Metadata and play status
de06cdccc4629cdfb12c16de226b3297377912e4 21-Mar-2013 Zhihai Xu <zhihaixu@google.com> Merge "framework support for new Bluetooth profiles AVRCP 1.3:Metadata and play status" into jb-mr2-dev
c1c259c0ace7195240f1443c805995bfe8692a72 14-Mar-2013 Zhihai Xu <zhihaixu@google.com> framework support for new Bluetooth profiles AVRCP 1.3:Metadata and play status

send track changed response if the metadata is changed.

issue 8383522

Change-Id: Ie55ed368d355484a6b83f4aa24c70aa33b72f799
ni/Android.mk
ni/com_android_bluetooth.h
ni/com_android_bluetooth_avrcp.cpp
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/Avrcp.java
eb42ecc1d3589c6d22920a2083ada8fd81d52396 20-Mar-2013 Sungmin Choi <sungmin.choi@lge.com> am 5d574612: enable xlsx, docx, pptx format to transfer/receive over bluetooth

* commit '5d5746124a5fd14a13ca7fd085aae6ec600d0ca7':
enable xlsx, docx, pptx format to transfer/receive over bluetooth
5d5746124a5fd14a13ca7fd085aae6ec600d0ca7 30-Nov-2012 Sungmin Choi <sungmin.choi@lge.com> enable xlsx, docx, pptx format to transfer/receive over bluetooth

Add proper MIME types for xlsx, docx, pptx.

Bug: 7479989
Change-Id: I77b065f7856fa399c5084ffa96deace0e3f15487
ndroidManifest.xml
rc/com/android/bluetooth/opp/Constants.java
8d424e11ddc3c4eacc7fbebd473c726d5bc1b57f 18-Mar-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I9ac563f8a32399252caa466d2b57b858eeff22ac
Auto-generated-cl: translation import
es/values-ro/strings.xml
es/values-ro/test_strings.xml
c7f38d71d51e3554ab03ffc4000ee444a1517d55 14-Mar-2013 Mike Lockwood <lockwood@google.com> Fix logging in GATT JNI code

Change-Id: I80057b4e4b1572daf745f53c3c47de21ac824076
ni/com_android_bluetooth_gatt.cpp
b241cda1eec2fbefd6d21e0819532f7a76947635 12-Mar-2013 Brian Carlstrom <bdc@google.com> resolved conflicts for merge of c508483d to jb-mr2-dev

Change-Id: I7f32e6dd98c3cc61030cded700587aa852c0fc0a
ni/com_android_bluetooth_btservice_AdapterService.cpp
c508483d99579bf439728133742d39d89c777615 12-Mar-2013 Brian Carlstrom <bdc@google.com> Merge "Cleanup Bluetooth AdapterService JNI"
f7d4dc0d29f25234518aed02ce395e4ac0d1aac7 12-Mar-2013 Brian Carlstrom <bdc@google.com> Cleanup Bluetooth AdapterService JNI

I was here to force the version to be initialized as required in the call to AttachCurrentThread.

Probably JNI_ABORT should be used in ReleaseByteArrayElements to avoid copy back, but 0 is semantically what was passed before.

Change-Id: I812b0785011385b033e67012faa08d113418f01e
ni/com_android_bluetooth_btservice_AdapterService.cpp
d1e5ee9cd1c68ad8eeca61700fe56638d7f3edd4 07-Mar-2013 Nigel Hannam <nigel@hannam.eu> AtPhonebook handleCpbsCommand was incorrectly sending two responses
to some requests (one inside the swtich statement, then repeating it
after breaking out of the switch statement).
This broke phonebook sync with Audi 2G MMI car kit.
Signed-off-by: Nigel Hannam <nigel@hannam.eu>

Change-Id: I65e54400aad2413725469951899d041870691369
rc/com/android/bluetooth/hfp/AtPhonebook.java
03b8386de26ba6500af2d66687bff9b01f2cbbd7 06-Feb-2013 Ganesh Ganapathi Batta <ganeshg@broadcom.com> Initial version of BLE support for Bluedroid

Change-Id: I9579b3074bc4bc59dd45f71c0937e8879196555e
ndroidManifest.xml
ni/Android.mk
ni/com_android_bluetooth.h
ni/com_android_bluetooth_btservice_AdapterService.cpp
ni/com_android_bluetooth_gatt.cpp
es/values/config.xml
rc/com/android/bluetooth/btservice/AbstractionLayer.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/btservice/Config.java
rc/com/android/bluetooth/gatt/ContextMap.java
rc/com/android/bluetooth/gatt/GattDebugUtils.java
rc/com/android/bluetooth/gatt/GattService.java
rc/com/android/bluetooth/gatt/GattServiceConfig.java
rc/com/android/bluetooth/gatt/HandleMap.java
rc/com/android/bluetooth/gatt/ScanClient.java
rc/com/android/bluetooth/gatt/SearchQueue.java
rc/com/android/bluetooth/gatt/ServiceDeclaration.java
8eb70f8bdf4e8c970810b3400aba8d08d14ce222 21-Feb-2013 Martijn Coenen <maco@google.com> Add OBEX object count support to Bluetooth.

To support Android Beam receiving information about
the number of files in a OPP transfer, add the Count
OBEX header. Also add a new intent to tell the handover
requested that a transfer has started, including the
count (if any).

Change-Id: Ib5e0e8dbc6c2e3259e0f732a507557c3688e168c
rc/com/android/bluetooth/opp/BluetoothOppBatch.java
rc/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
rc/com/android/bluetooth/opp/BluetoothOppObexSession.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/opp/Constants.java
34e323baafb5563c3874f95847ec544faf6923f8 14-Feb-2013 Matthew Xie <mattx@google.com> Turn on some debug message in Adapter service

We had turned off too much debug messages. It is getting hard to
make out useful information from bugreports. Now, selectively turn
on some messages.

Change-Id: Ia62bc9d5967a10690709abaa0e20a15dd01c258d
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/AdapterState.java
f206526c98d3c1038dbb5c575d47711e433f5fdf 14-Feb-2013 Matthew Xie <mattx@google.com> Merge "turn off getState debug message, not so useful now"
6efae4264e5b216b37e8da5ced41a7898e18ca3a 14-Feb-2013 Matthew Xie <mattx@google.com> turn off getState debug message, not so useful now

Change-Id: I258cb35f3166ac8a6a4c4ee7965db527cf17c2e2
rc/com/android/bluetooth/btservice/AdapterService.java
41b7cd3b8c9288a5861dce05d36b7fef3fff305a 30-Jan-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I0f0cec686b588b4a7bd0890bdc81297c9e0506ff
Auto-generated-cl: translation import
es/values-sw/strings.xml
522d3b2b0a69c0157ca87995d92bb712f6102c1a 28-Jan-2013 Wink Saville <wink@google.com> Add protected log methods to StateMachine

This allow child classes to Override the logging and
have consistent behavior across StateMachines.

Change-Id: I7e23a44d08ca304ade2d7830fd0e307f63f1879e
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
61fa4903058a68538948d624271be96810defab4 15-Jan-2013 Matthew Xie <mattx@google.com> Use getRadioTechnology call instead of getRilVoiceRadioTechnology

getRilVoiceRadioTechnology had obsoleted getRadioTechnology
We are using the obsolete method to get bluetooth master compile
with aosp build for Broadcom branch.

Change-Id: Ica4258f99be82a2b0e04f74eac0bc5ee95f0a914
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
3cba4c44cb1f249d78c43d6e40e508cd0505b95b 11-Jan-2013 Adam Powell <adamp@android.com> am 43f8ccf6: am 6eb3b8d3: Merge "Upgrade the app to better follow holo guidelines"

* commit '43f8ccf63a02b28be395fd223461f1421ea2aa99':
Upgrade the app to better follow holo guidelines
43f8ccf63a02b28be395fd223461f1421ea2aa99 09-Jan-2013 Adam Powell <adamp@android.com> am 6eb3b8d3: Merge "Upgrade the app to better follow holo guidelines"

* commit '6eb3b8d3b7ffc1d80ae7734042e2c4d36a77a19f':
Upgrade the app to better follow holo guidelines
6eb3b8d3b7ffc1d80ae7734042e2c4d36a77a19f 09-Jan-2013 Adam Powell <adamp@android.com> Merge "Upgrade the app to better follow holo guidelines"
24a20283edda2797a144262125e1d85775680f84 02-Jan-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I4ae6a84f16401f7b8f18414b1936cd6f1b2d8bb7
Auto-generated-cl: translation import
es/values-es-rUS/strings.xml
d9bd906c02fd27e51e637ee661e424951ff27f39 20-Dec-2012 Zhihai Xu <zhihaixu@google.com> Merge "Bluetooth OPP should sanitize Uri data and MIME types before calling startActivity"
961ecd946bd87d22ea9e983dea8146ccca53981a 06-Dec-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I840504c614699e56c7755b4d26d47e8362c640ed
Auto-generated-cl: translation import
es/values-in/strings.xml
04ebe44a6a6e2da1dfd7a9cacf326667fbb32cd7 03-Dec-2012 Matthew Xie <mattx@google.com> am 67b17615: am fa5a6aff: Merge "Clean up debug messages" into jb-mr1.1-dev

* commit '67b1761534d7e2518830cfb3d2c28271ffe56a26':
Clean up debug messages
67b1761534d7e2518830cfb3d2c28271ffe56a26 03-Dec-2012 Matthew Xie <mattx@google.com> am fa5a6aff: Merge "Clean up debug messages" into jb-mr1.1-dev

* commit 'fa5a6affffb0efe6c41ea44499b0e9b619bee161':
Clean up debug messages
fa5a6affffb0efe6c41ea44499b0e9b619bee161 03-Dec-2012 Matthew Xie <mattx@google.com> Merge "Clean up debug messages" into jb-mr1.1-dev
a64467b1203269cb620e4ea9b3cb7ba0b1aaa3de 01-Dec-2012 Zhihai Xu <zhihaixu@google.com> am 3d34fdb1: am 28cc9881: need send status code back(OK) after broadcast the intent(VENDOR_SPECIFIC_HEADSET_EVENT)

* commit '3d34fdb17090e476a5ccd6d7bb57d61d9f528eff':
need send status code back(OK) after broadcast the intent(VENDOR_SPECIFIC_HEADSET_EVENT)
3d34fdb17090e476a5ccd6d7bb57d61d9f528eff 01-Dec-2012 Zhihai Xu <zhihaixu@google.com> am 28cc9881: need send status code back(OK) after broadcast the intent(VENDOR_SPECIFIC_HEADSET_EVENT)

* commit '28cc9881bb7fb2e5e410006f4f303c494b97665e':
need send status code back(OK) after broadcast the intent(VENDOR_SPECIFIC_HEADSET_EVENT)
28cc9881bb7fb2e5e410006f4f303c494b97665e 01-Dec-2012 Zhihai Xu <zhihaixu@google.com> need send status code back(OK) after broadcast the intent(VENDOR_SPECIFIC_HEADSET_EVENT)

bug 7564004

Change-Id: I5fc1eed1c0db194c3fdd63799b2340eea994988d
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
0f4ef70f0bc246b224f7b6da524128db89fcc8a7 30-Nov-2012 Matthew Xie <mattx@google.com> Clean up debug messages

bug 7626174

Change-Id: I0161d54dd325a7a1afcf8926ef54cd483e7503fb
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/ProfileService.java
rc/com/android/bluetooth/hid/HidService.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
616ea6f6dee795f76b331b05ea8f20ecbd0518c4 28-Nov-2012 Zhihai Xu <zhihaixu@google.com> am 78622268: am e2039454: Merge "Code to broadcast VENDOR_SPECIFIC_HEADSET_EVENT missing" into jb-mr1.1-dev

* commit '786222689749046824ba206ab32f8ac9794c998b':
Code to broadcast VENDOR_SPECIFIC_HEADSET_EVENT missing
786222689749046824ba206ab32f8ac9794c998b 27-Nov-2012 Zhihai Xu <zhihaixu@google.com> am e2039454: Merge "Code to broadcast VENDOR_SPECIFIC_HEADSET_EVENT missing" into jb-mr1.1-dev

* commit 'e203945454e23b2fd31ad278f7d374e1e1ccf2db':
Code to broadcast VENDOR_SPECIFIC_HEADSET_EVENT missing
e203945454e23b2fd31ad278f7d374e1e1ccf2db 27-Nov-2012 Zhihai Xu <zhihaixu@google.com> Merge "Code to broadcast VENDOR_SPECIFIC_HEADSET_EVENT missing" into jb-mr1.1-dev
dd66c701616d77e5bf7f5fd795999f59e5fe28bd 18-Nov-2012 Zhihai Xu <zhihaixu@google.com> Code to broadcast VENDOR_SPECIFIC_HEADSET_EVENT missing

add +XEVENT vendor specific command handler in processUnknownAt

bug 7564004

Change-Id: I78847553700b2da28dbf9ca8f9d0509f5f3fa924
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
cae4f76797a8d32657eaa0fdc4294cc0ba944c9c 16-Nov-2012 Wink Saville <wink@google.com> Rename get radio technology

Change-Id: I83f2b0eda8c6ccdff1b7253164e2531ca1357e72
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
ad4d840680e407633f4492633885a8149139fdd2 16-Nov-2012 Wink Saville <wink@google.com> Merge "Revert "Rename get radio technology""
c63208de4e1ce7cf4866bd85ad2a327b9da3a340 16-Nov-2012 Wink Saville <wink@google.com> Revert "Rename get radio technology"

This reverts commit d38211fe71e9e738290c6b84ef70188b8ac55071

Change-Id: I8e8cda5ce923ccec6827e9b5609d82c765b15ae2
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
a614049ef4be9ba05228ae7c6bc4953299b7892f 15-Nov-2012 Wink Saville <wink@google.com> Merge "Rename get radio technology"
d9d397854afd6511e2987ea7ae3ec8528183aefa 19-Sep-2012 blunden <blunden2@gmail.com> Upgrade the app to better follow holo guidelines

- Fix the icon scaling in the transfer list
The icon is centered and upscaled instead of just centered.

- Remove dialog info icon according to UI team recommendation

- Replace icons with holo versions and add xhdpi

Change-Id: Id3b06e8e06244ec8859d65404d779b66c1354e3d
es/drawable-hdpi/bt_incomming_file_notification.png
es/drawable-mdpi/bt_incomming_file_notification.png
es/drawable-xhdpi/bt_incomming_file_notification.png
es/layout/bluetooth_transfer_item.xml
rc/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java
rc/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
rc/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
rc/com/android/bluetooth/pbap/BluetoothPbapActivity.java
7ca70cc817ce02a3b7b1eb8db7cd58fd04f0e41f 13-Nov-2012 Zhihai Xu <zhihaixu@google.com> am a6853edb: am 4daa2db1: Merge "need to send BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED intent to all users" into jb-mr1.1-dev

* commit 'a6853edb4504e95dcd07e0ffc306ef07dc759b56':
need to send BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED intent to all users
58758437f9661d1dc730b79d128e0581c3d0df36 13-Nov-2012 Fred <fredc@broadcom.com> am 641b4e22: am cb7b1a54: Fixed potention ANR issue with Bluetooth OPP share.

* commit '641b4e22af7aa0e3b426eaad395f7887c10a9546':
Fixed potention ANR issue with Bluetooth OPP share.
9925c8e4e27ba8db1c93f82e88b7cad1870b76ff 13-Nov-2012 Fred <fredc@broadcom.com> am e3e1e8d1: Fixed potention ANR issue with Bluetooth OPP share.

* commit 'e3e1e8d1fe2a75b38ee1dfe5a102685877a22f84':
Fixed potention ANR issue with Bluetooth OPP share.
a6853edb4504e95dcd07e0ffc306ef07dc759b56 13-Nov-2012 Zhihai Xu <zhihaixu@google.com> am 4daa2db1: Merge "need to send BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED intent to all users" into jb-mr1.1-dev

* commit '4daa2db107f17fa8e8dfe35003924c69566bccb6':
need to send BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED intent to all users
641b4e22af7aa0e3b426eaad395f7887c10a9546 13-Nov-2012 Fred <fredc@broadcom.com> am cb7b1a54: Fixed potention ANR issue with Bluetooth OPP share.

* commit 'cb7b1a54ae3ce309210824099253a916a04d350b':
Fixed potention ANR issue with Bluetooth OPP share.
4daa2db107f17fa8e8dfe35003924c69566bccb6 13-Nov-2012 Zhihai Xu <zhihaixu@google.com> Merge "need to send BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED intent to all users" into jb-mr1.1-dev
31be0d2814d1d3c640160aeafba17feafbaa8bb6 13-Nov-2012 Zhihai Xu <zhihaixu@google.com> need to send BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED intent to all users

We need to send BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED intent to all users
because bluetooth manager service use this intent to change name.
Bluetooth manager service is always running as User 0. but it is always binding
to bluetooth service running at foreground user, So the bluetooth service
need send BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED broadcast intent
to all users to let bluetooth manager service to receive it at any cases.

bug 7476965

Change-Id: I816786d0828d4a7d414077b1ccbe12d2e273fc75
rc/com/android/bluetooth/btservice/AdapterProperties.java
e3e1e8d1fe2a75b38ee1dfe5a102685877a22f84 29-Sep-2012 Fred <fredc@broadcom.com> Fixed potention ANR issue with Bluetooth OPP share.

Updated BluetoothOppLauncherActivity so the call to
BluetoothOppManager.saveSendingFileInfo() runs on a child thread.
saveSendingFileInfo() opens/constructs the content stream, which
can take a long time, depending on the type of content.
It should not run inside the main UI thread of the
BluetoothOppLauncherActivity.

Bug 6802063

Change-Id: Id34b33fe37eb029d6a7592a811bbc9bbcde14ba8
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
cb7b1a54ae3ce309210824099253a916a04d350b 29-Sep-2012 Fred <fredc@broadcom.com> Fixed potention ANR issue with Bluetooth OPP share.

Updated BluetoothOppLauncherActivity so the call to
BluetoothOppManager.saveSendingFileInfo() runs on a child thread.
saveSendingFileInfo() opens/constructs the content stream, which
can take a long time, depending on the type of content.
It should not run inside the main UI thread of the
BluetoothOppLauncherActivity.

Bug 6802063

Change-Id: Id34b33fe37eb029d6a7592a811bbc9bbcde14ba8
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
d38211fe71e9e738290c6b84ef70188b8ac55071 02-Nov-2012 Wink Saville <wink@google.com> Rename get radio technology

Change-Id: I267f54c5533f815d14c8f7a2f81545c8e08b773c
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
bc376f54a0669c63b925eab7203d0ebbd9cac8ca 02-Nov-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I0fb25c32cec8d8a26691c05946999890d8115a5d
Auto-generated-cl: translation import
es/values-am/strings.xml
61a19e682b8110e710b56bd26b3aa9d0fa9243b9 31-Oct-2012 Martijn Coenen <maco@google.com> am 929aa0f5: am 19d8d544: Temporarily add GALLERY_PROVIDER permission to fix Beam.

* commit '929aa0f501d196b5b5fecc2a05d0bc1096ada464':
Temporarily add GALLERY_PROVIDER permission to fix Beam.
929aa0f501d196b5b5fecc2a05d0bc1096ada464 31-Oct-2012 Martijn Coenen <maco@google.com> am 19d8d544: Temporarily add GALLERY_PROVIDER permission to fix Beam.

* commit '19d8d5447897a7f8f4ee1ac2745639e4c8c1ff8b':
Temporarily add GALLERY_PROVIDER permission to fix Beam.
19d8d5447897a7f8f4ee1ac2745639e4c8c1ff8b 30-Oct-2012 Martijn Coenen <maco@google.com> Temporarily add GALLERY_PROVIDER permission to fix Beam.

Photo transfers incoming through Android Beam switch processes
twice (Gallery->NFC, NFC->Bluetooth), and the permission to
access to the Gallery content provider is not transferred.
As a short term solution, grant Gallery provider
permissions to Bluetooth.

Bug: 7433498
Change-Id: Id5915f4a37bec5003a42646162249a0c2c69aa48
ndroidManifest.xml
e05729b20734f7e7cdc9dd099c18ed362ec76eaa 24-Oct-2012 Zhihai Xu <zhihaixu@google.com> am 8b709b4c: am ede67c26: License of files Bluetooth package is not updated to ASL2

* commit '8b709b4caac6e0cdb35a117fa3a523d0200a203f':
License of files Bluetooth package is not updated to ASL2
8b709b4caac6e0cdb35a117fa3a523d0200a203f 24-Oct-2012 Zhihai Xu <zhihaixu@google.com> am ede67c26: License of files Bluetooth package is not updated to ASL2

* commit 'ede67c26e7b2564ea35db6d9b3027a269c150e13':
License of files Bluetooth package is not updated to ASL2
ede67c26e7b2564ea35db6d9b3027a269c150e13 24-Oct-2012 Zhihai Xu <zhihaixu@google.com> License of files Bluetooth package is not updated to ASL2

bug 7385618

Change-Id: I338fd87083387706f3b5f410c9592219bb8a1acb
ni/com_android_bluetooth.h
ni/com_android_bluetooth_a2dp.cpp
ni/com_android_bluetooth_btservice_AdapterService.cpp
ni/com_android_bluetooth_hdp.cpp
ni/com_android_bluetooth_hfp.cpp
ni/com_android_bluetooth_hid.cpp
ni/com_android_bluetooth_pan.cpp
rc/com/android/bluetooth/Utils.java
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/btservice/AbstractionLayer.java
rc/com/android/bluetooth/btservice/AdapterApp.java
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterState.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/btservice/Config.java
rc/com/android/bluetooth/btservice/JniCallbacks.java
rc/com/android/bluetooth/btservice/ProfileService.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
rc/com/android/bluetooth/hdp/HealthService.java
rc/com/android/bluetooth/hfp/HeadsetHalConstants.java
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
rc/com/android/bluetooth/hid/HidService.java
rc/com/android/bluetooth/pan/PanService.java
29ffece7c6e7ee94bf41df75bbde026a93130709 17-Oct-2012 Zhihai Xu <zhihaixu@google.com> am b1f690e1: am bd704c74: BT connection notification in not updated in status bar for second user It is due to the system UI is always running as the first user. It can\'t receive broadcast intent ACTION_CONNECTION_STATE_CHANGED and ACTION_BOND_STATE_CHANGED from blue

* commit 'b1f690e19d77b67630004517c5342f89b578f204':
BT connection notification in not updated in status bar for second user It is due to the system UI is always running as the first user. It can't receive broadcast intent ACTION_CONNECTION_STATE_CHANGED and ACTION_BOND_STATE_CHANGED from bluetooth service when We switch to second user. Also the system UI also is running as uid 10055, which will also call function isEnabled, getState, getBondedDevices, getAdapterConnectionState and getBondState in bluetooth service. I allow these functions to be called by all the users. I forget remove check for getBondState in my first patch set
b1f690e19d77b67630004517c5342f89b578f204 17-Oct-2012 Zhihai Xu <zhihaixu@google.com> am bd704c74: BT connection notification in not updated in status bar for second user It is due to the system UI is always running as the first user. It can\'t receive broadcast intent ACTION_CONNECTION_STATE_CHANGED and ACTION_BOND_STATE_CHANGED from bluetooth service

* commit 'bd704c741b8c523ad747214f6f0520ac3e2caf8f':
BT connection notification in not updated in status bar for second user It is due to the system UI is always running as the first user. It can't receive broadcast intent ACTION_CONNECTION_STATE_CHANGED and ACTION_BOND_STATE_CHANGED from bluetooth service when We switch to second user. Also the system UI also is running as uid 10055, which will also call function isEnabled, getState, getBondedDevices, getAdapterConnectionState and getBondState in bluetooth service. I allow these functions to be called by all the users. I forget remove check for getBondState in my first patch set
bd704c741b8c523ad747214f6f0520ac3e2caf8f 17-Oct-2012 Zhihai Xu <zhihaixu@google.com> BT connection notification in not updated in status bar for second user
It is due to the system UI is always running as the first user. It can't receive
broadcast intent ACTION_CONNECTION_STATE_CHANGED and ACTION_BOND_STATE_CHANGED
from bluetooth service when We switch to second user. Also the system UI also
is running as uid 10055, which will also call function isEnabled, getState,
getBondedDevices, getAdapterConnectionState and getBondState in bluetooth service.
I allow these functions to be called by all the users.
I forget remove check for getBondState in my first patch set

bug 7333382

Change-Id: I57f39a722e78d6d2453ebfecaab043637fef4d9c
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
e5c8dea195cb38ab82afdb385501e978de4e27da 16-Oct-2012 Jake Hamby <jhamby@google.com> am f128aa02: am a595fcc5: Fix crash in Bluetooth when sharing MMS video.

* commit 'f128aa0298dcaf07cf0bec0717943dd1f97b1eb6':
Fix crash in Bluetooth when sharing MMS video.
f128aa0298dcaf07cf0bec0717943dd1f97b1eb6 16-Oct-2012 Jake Hamby <jhamby@google.com> am a595fcc5: Fix crash in Bluetooth when sharing MMS video.

* commit 'a595fcc57e7f0be9cf57913cd665dc99e4001b16':
Fix crash in Bluetooth when sharing MMS video.
a595fcc57e7f0be9cf57913cd665dc99e4001b16 16-Oct-2012 Jake Hamby <jhamby@google.com> Fix crash in Bluetooth when sharing MMS video.

Some content providers, such as MMS, don't support the DISPLAY_NAME
or SIZE columns for content URIs. Fall back to using the last segment
of the URI as the filename for Bluetooth file transfers if the query
for DISPLAY_NAME fails.

Bug: 7343310
Change-Id: Ie048c5eea3ba9994259c9e07beabd72622d6b669
rc/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
098bcfa7dbace632a7d56bc650d0dbfab7bb2106 12-Oct-2012 Adam Powell <adamp@android.com> am 83f334c0: am d329befd: Merge "Bluetooth: Use proper holo alert drawable"

* commit '83f334c0f748a5ee8b68d85fd0133c73e5d6bf28':
Bluetooth: Use proper holo alert drawable
83f334c0f748a5ee8b68d85fd0133c73e5d6bf28 12-Oct-2012 Adam Powell <adamp@android.com> am d329befd: Merge "Bluetooth: Use proper holo alert drawable"

* commit 'd329befdd38a5c441e1a2b7e4595b7de86ac100b':
Bluetooth: Use proper holo alert drawable
d329befdd38a5c441e1a2b7e4595b7de86ac100b 12-Oct-2012 Adam Powell <adamp@android.com> Merge "Bluetooth: Use proper holo alert drawable"
620ba2788c4f52e40259106aceac4d4109b9a8e1 11-Oct-2012 Matthew Xie <mattx@google.com> am fb8b2791: Fix NREC command format error

* commit 'fb8b279141dac5255926d2dd4317f803cd1bbcf0':
Fix NREC command format error
3911cfeb7c5e2242dcce91e3b66d9449dec0bd05 11-Oct-2012 Zhihai Xu <zhihaixu@google.com> Bluetooth OPP should sanitize Uri data and MIME types before calling startActivity

bug 5842045

Change-Id: I00a80fc7dc6c6031ab35113539ff6cdf4cf230a6
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
rc/com/android/bluetooth/opp/BluetoothOppLiveFolder.java
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppTransferHistory.java
rc/com/android/bluetooth/opp/BluetoothOppUtility.java
rc/com/android/bluetooth/opp/Constants.java
fb8b279141dac5255926d2dd4317f803cd1bbcf0 11-Oct-2012 Matthew Xie <mattx@google.com> Fix NREC command format error

Add = sign before off
bug 7326510

Change-Id: Ief269f608646acaa2872679a5c649da3cf22de37
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
355d4d7bb13e95e246fca122c1bf413fbcf08fd6 10-Oct-2012 Matthew Xie <mattx@google.com> am df9d0fe5: Merge "Turn off dbg messages, be prepared for production build" into jb-mr1-dev

* commit 'df9d0fe584874f8cafa6ecedb3c3c054c9e99cba':
Turn off dbg messages, be prepared for production build
df9d0fe584874f8cafa6ecedb3c3c054c9e99cba 10-Oct-2012 Matthew Xie <mattx@google.com> Merge "Turn off dbg messages, be prepared for production build" into jb-mr1-dev
4257a7ed952c06bdaaffe04a3ac295995e4821c5 10-Oct-2012 Zhihai Xu <zhihaixu@google.com> am cd18678b: Merge "Bluetooth multi-user updates: change bluetooth service to reject background user access." into jb-mr1-dev

* commit 'cd18678b1e100052023706746d2578ebfd433958':
Bluetooth multi-user updates: change bluetooth service to reject background user access.
cd18678b1e100052023706746d2578ebfd433958 10-Oct-2012 Zhihai Xu <zhihaixu@google.com> Merge "Bluetooth multi-user updates: change bluetooth service to reject background user access." into jb-mr1-dev
37510150ee738ccfa5913f7120e28f25ae7768df 09-Oct-2012 Zhihai Xu <zhihaixu@google.com> Bluetooth multi-user updates: change bluetooth service
to reject background user access.

bug 6925422

Change-Id: I11d5ebf007c2843a72a9870055fc96672daf8409
ndroidManifest.xml
rc/com/android/bluetooth/Utils.java
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/hdp/HealthService.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hid/HidService.java
rc/com/android/bluetooth/pan/PanService.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
b754141764270d8b7927dd8d0fc3de66e09a28f6 09-Oct-2012 Matthew Xie <mattx@google.com> am da3d0ac5: Config pbap_include_photots_in_vcard false as default

* commit 'da3d0ac516109a213cfc281dfaadc9b1d9a2fa5c':
Config pbap_include_photots_in_vcard false as default
da3d0ac516109a213cfc281dfaadc9b1d9a2fa5c 09-Oct-2012 Matthew Xie <mattx@google.com> Config pbap_include_photots_in_vcard false as default

bug 7070862

Change-Id: I7de38269e3ea451b44d9a9afd0477dedc6978987
es/values/config.xml
fd1da115cbf09b7dd9bca3c7d3a4fb816a835dc5 08-Oct-2012 Matthew Xie <mattx@google.com> Turn off dbg messages, be prepared for production build

bug 7174712

Change-Id: I58747ec6507da8ea8ae27a182b601aaf626ede42
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/btservice/AdapterApp.java
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterState.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/btservice/ProfileService.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
rc/com/android/bluetooth/hdp/HealthService.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
rc/com/android/bluetooth/hid/HidService.java
rc/com/android/bluetooth/opp/Constants.java
rc/com/android/bluetooth/pan/PanService.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
8e5f1181c57e9c8597303e67dece453cd5fb87bd 05-Oct-2012 Matthew Xie <mattx@google.com> am 344036be: Make Bluetooth Services support multi user

* commit '344036be03c7bb0ef5eb101416b122152b61ca0c':
Make Bluetooth Services support multi user
344036be03c7bb0ef5eb101416b122152b61ca0c 02-Oct-2012 Matthew Xie <mattx@google.com> Make Bluetooth Services support multi user

Add bt_net_stack permission
bug 6925422

Change-Id: I5765a9cc770f7c48eb88bff4757b276f0cad4709
ndroidManifest.xml
4b952c66a9fe0349f0e77d3d58b25763064b4938 04-Oct-2012 zzy <zhenye@broadcom.com> am be38be94: remove the AT command separator from the CPBR range parameters

* commit 'be38be94c0a2faf3802b596be5b3ab568d6d85a4':
remove the AT command separator from the CPBR range parameters
be38be94c0a2faf3802b596be5b3ab568d6d85a4 04-Oct-2012 zzy <zhenye@broadcom.com> remove the AT command separator from the CPBR range parameters

Root cause: Integer.parseInt(indices[0]) throw exception if char ';' at the end.

Bug 7274805
rc/com/android/bluetooth/hfp/AtPhonebook.java
fc2eefd9fba91f95e1937bb7fbbc5d7bb47d5526 03-Oct-2012 Matthew Xie <mattx@google.com> am 6458cffa: Move socket initialization code out of pbap service\'s main thread

* commit '6458cffaca286611e898c75ad86e2d98c89008b6':
Move socket initialization code out of pbap service's main thread
6458cffaca286611e898c75ad86e2d98c89008b6 02-Oct-2012 Matthew Xie <mattx@google.com> Move socket initialization code out of pbap service's main thread

Socket initialization need the preparation from stack and a domain socket
connection. All this takes time and not proper to be run in the main thread.
bug 7258324

Change-Id: Ic46601602556c2949f18d446016188d874099874
rc/com/android/bluetooth/btservice/RemoteDevices.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
b6636f7f177253da530c393d514adc8c5281a09c 01-Oct-2012 Jeff Sharkey <jsharkey@android.com> am c7ead6d5: Move bluetooth priorities from Secure to Global.

* commit 'c7ead6d5827f3832b9210e92fab7597142059852':
Move bluetooth priorities from Secure to Global.
c7ead6d5827f3832b9210e92fab7597142059852 01-Oct-2012 Jeff Sharkey <jsharkey@android.com> Move bluetooth priorities from Secure to Global.

Bug: 7231171
Change-Id: I39e3611dcec1104558704ed72855fef85f33c084
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hid/HidService.java
f67a71a199cd9615768b9b636bfc3bc5d6d8f6cd 28-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I820cacfe1910aa6a2f34e0e9c61756c07480b4c3
Auto-generated-cl: translation import
es/values-pt-rPT/strings.xml
6cae556a163372a6bbfc59c33fb9fb4bf6663826 26-Sep-2012 Matthew Xie <mattx@google.com> am 0e463621: Add MODIFY_PHONE_STATE permission to access Bluetooth service in Phone app

* commit '0e46362107a23fcfe829b270f3ff987d911cd102':
Add MODIFY_PHONE_STATE permission to access Bluetooth service in Phone app
0e46362107a23fcfe829b270f3ff987d911cd102 26-Sep-2012 Matthew Xie <mattx@google.com> Add MODIFY_PHONE_STATE permission to access Bluetooth service in Phone app

Enforce MODIFY_PHONE_STATE permission for some HeadsetService APIs that
only provided for Phone app for phone stat change notifications
bug 7115021

Change-Id: I62e3f429f4205feb50e123ee94b4c468999804a6
ndroidManifest.xml
rc/com/android/bluetooth/hfp/HeadsetService.java
d98b4513a2eb425123735bc53931364abc6ee516 20-Sep-2012 zzy <zhenye@broadcom.com> am ebdb4d92: When pbap cleanup, stopSelfResult called twice with same service id

* commit 'ebdb4d92c0ea0b5e40afe0feec71105695d27a4c':
When pbap cleanup, stopSelfResult called twice with same service id
ebdb4d92c0ea0b5e40afe0feec71105695d27a4c 12-Sep-2012 zzy <zhenye@broadcom.com> When pbap cleanup, stopSelfResult called twice with same service id

This seemed like to be the root casue of bug 7136940. The thread 3564 stuck after following log:
09-10 11:24:08.882 3564 V BluetoothPbapService: Pbap Service closeService

bug 7136940
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
e36b87e68c170afb713502ba00f5b9dfc8056b64 20-Sep-2012 John Huang <jsh@google.com> am 826318bb: Merge "Enable Bluetooth sharing of downloaded files." into jb-mr1-dev

* commit '826318bb9de042f10df8639da2965bf4d9d38e85':
Enable Bluetooth sharing of downloaded files.
826318bb9de042f10df8639da2965bf4d9d38e85 19-Sep-2012 John Huang <jsh@google.com> Merge "Enable Bluetooth sharing of downloaded files." into jb-mr1-dev
c0d9e04fcdf2fffcb64e1ef178281f8d1c4eeccd 19-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am faebb8f4: Revert "Reference headers in their new location"

* commit 'faebb8f49fb0f4c0810c08f76246f65fd95bfdfc':
Revert "Reference headers in their new location"
faebb8f49fb0f4c0810c08f76246f65fd95bfdfc 18-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Revert "Reference headers in their new location"

This reverts commit 7e2c121e720d9c4f7914df218c30b240662fe0b2.
ni/Android.mk
fa7f50eb387bbf00c3730b04b9280dfa47157bd3 17-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Merge

Change-Id: Ic9b2ccc47431764df8248f64d3e72b0f32ac5488
2ebf3eb94d5aa3119af7a4b7d0a4241a8a91e601 16-Sep-2012 Wink Saville <wink@google.com> Merge "Add StateMachine make methods." into jb-mr1-dev
7e2c121e720d9c4f7914df218c30b240662fe0b2 15-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Reference headers in their new location

Change-Id: I45608fe5089492b20d09abeda624b8d32c5343e7
ni/Android.mk
6893668d1ccf0cc6361ef31ace52fedc2e37e35a 15-Sep-2012 Wink Saville <wink@google.com> Add StateMachine make methods.

StateMachines must be started before any messages are sent to them
otherwise an exception is thrown.

Bug: 7091976
Change-Id: I05315d45d4d6db42843442b7feb37c665cfabcab
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterState.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
ee52ddf33a0ce2cf89cc028136f60ae600c45de5 27-Jul-2012 Jake Hamby <jhamby@google.com> Enable Bluetooth sharing of downloaded files.

Change BT OPP to open the InputStreams of files to share in the
BluetoothOppLauncherActivity (or BluetoothOppHandoverReceiver
for NFC shares), while the process has grantUriPermission() on
the URI's to share.

InputStreams are saved inside the existing BluetoothOppSendFileInfo
objects, which no longer include the mDestination field because
this isn't known at the time the SendFileInfo object is now created
(before the user has chosen the destination BT device). These
objects are stored in a static ConcurrentHashMap in BluetoothOppUtility
and are removed when the file is closed (on success or failure).

If the user tries to share thousands of files in one batch, we may
not be able to open InputStreams for all of the files in the batch.
In this case, the open should fail gracefully.

Bug: 6808783
Change-Id: I3f3f86d2dc1a78a837aeb6a888f90b26434ba499
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
rc/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/BluetoothOppShareInfo.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/opp/BluetoothOppUtility.java
940616761f5e1a10e00390de8952815ffb121a88 14-Sep-2012 Matthew Xie <mattx@google.com> am f46f032a: Donot include photo in vard in pbap

* commit 'f46f032adaec19a0d0c11b921fb356cbcd7aedbd':
Donot include photo in vard in pbap
f46f032adaec19a0d0c11b921fb356cbcd7aedbd 14-Sep-2012 Matthew Xie <mattx@google.com> Donot include photo in vard in pbap

Certain carkit abort pbap transfer if vcard includes photo
bug 7070862

Change-Id: Iacd7e20901a7450599e844d1fb34923108e81bdc
rc/com/android/bluetooth/pbap/BluetoothPbapConfig.java
b10e8e21a4c7a43dbb9d79dacd76546d5cc70bca 13-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ic284c2c7e912b0d2a45847db0b6e16aabb9db6c9
Auto-generated-cl: translation import
es/values-sw/strings.xml
9d6446ae99ba68d3c2b9259a2e5f8f3e0726725b 13-Sep-2012 zzy <zhenye@broadcom.com> am 1c03c84f: fixed bt on off stress test issue

* commit '1c03c84f90991f6c9c740d72d91716d4b6a933e4':
fixed bt on off stress test issue
f880d3d3e024e3b272535dffa145c75b62daa19d 12-Sep-2012 Kausik Sinnaswamy <kausik@broadcom.com> am 37e1e995: Terminate PBAP service cleanly during BT off

* commit '37e1e995fdfd6aecd53f1fd1f8f0928021472db1':
Terminate PBAP service cleanly during BT off
1c03c84f90991f6c9c740d72d91716d4b6a933e4 11-Sep-2012 zzy <zhenye@broadcom.com> fixed bt on off stress test issue

root cause: cleanup stack process overlapped with bt turning
on process sometime. The cleanup() call in adapterservice.java
need to be call from onUnbind() to synchronize the
BluetoothSererviceManager unbindandFinish() call.
bug 7083069

Change-Id: Ib4c64d7e5fc996277278471969f187bb5e915a76
rc/com/android/bluetooth/btservice/AdapterService.java
09f5dca9925c75166688e1ab7aa5ce377277e395 16-Jun-2012 Björn Lundén <blunden2@gmail.com> Bluetooth: Use proper holo alert drawable

Make it use the holo drawables instead of the GB
compability drawable.

Change-Id: Ib85d89f0f3a6248d357a612afa8c0158a0876b86
rc/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java
rc/com/android/bluetooth/opp/BluetoothOppBtErrorActivity.java
rc/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
37e1e995fdfd6aecd53f1fd1f8f0928021472db1 10-Sep-2012 Kausik Sinnaswamy <kausik@broadcom.com> Terminate PBAP service cleanly during BT off

PBAP service runs in a loop of 10 trials to create the RFCOMM listener
thread; this loop is not getting interrupted during BT off, due to which
we end up delaying PBAP stop by 3 seconds (10 * 300ms). The fix is to
check for BT state after RFCOMM listener failure and break out of the
loop if BT is being turned off.
bug 7134544

Change-Id: I81d2a559857eef9138ebca662ea28f1d3e358bb8
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
007b4938e88f6dec030dd3f06662cbc4d8b103b3 11-Sep-2012 Matthew Xie <mattx@google.com> am 8ca777c3: Revert "Terminate PBAP service cleanly during BT off"

* commit '8ca777c3299ebf8c5869d46ba80d3fa474814751':
Revert "Terminate PBAP service cleanly during BT off"
25dc002661a7962b950ad6889bc9a0e29e670555 11-Sep-2012 Kausik Sinnaswamy <kausik@broadcom.com> am f5d88a7b: Terminate PBAP service cleanly during BT off

* commit 'f5d88a7b8659bb9ce49edc4faea6bf56f2158572':
Terminate PBAP service cleanly during BT off
744d81617b8ab1a89e2482fcfe3b5551b5396dba 11-Sep-2012 zzy <zhenye@broadcom.com> am 3237754f: fixed local reference leak

* commit '3237754f492015699fc91508d76c2e123d6f3c42':
fixed local reference leak
8ca777c3299ebf8c5869d46ba80d3fa474814751 10-Sep-2012 Matthew Xie <mattx@google.com> Revert "Terminate PBAP service cleanly during BT off"

This reverts commit f5d88a7b8659bb9ce49edc4faea6bf56f2158572

Change-Id: I67a4950831dce7392d63edad6f693abcc69d2ffe
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
f5d88a7b8659bb9ce49edc4faea6bf56f2158572 10-Sep-2012 Kausik Sinnaswamy <kausik@broadcom.com> Terminate PBAP service cleanly during BT off

PBAP service runs in a loop of 10 trials to create the RFCOMM listener
thread; this loop is not getting interrupted during BT off, due to which
we end up delaying PBAP stop by 3 seconds (10 * 300ms). The fix is to
check for BT state after RFCOMM listener failure and break out of the
loop if BT is being turned off.
bug 7134544

Change-Id: I35db2221be30980bec973253cdd888e0ce8cc36b
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
3237754f492015699fc91508d76c2e123d6f3c42 08-Sep-2012 zzy <zhenye@broadcom.com> fixed local reference leak
ni/com_android_bluetooth_pan.cpp
431b4aa0d40c6dd51b502f916f870a76801117e5 10-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I6c8a6f3d750129206f41c7a9c43a3c7f2bcb3052
Auto-generated-cl: translation import
es/values-zh-rTW/strings.xml
9eb4a84924718019c35fc5b32e59a6750ecf4116 29-Aug-2012 Ravi Nagarajan <nravi@broadcom.com> Adjust profile priorities when setting auto-connect

At a given point only one device should be set to have
PRIORITY_AUTO_CONNECT per profile. When setting a device priority
adjust the other devices' priority to make sure auto-connect
is attempted with only one device
bug 7076087

Change-Id: I1e03945a06e7acc901b53f34429194b3c3e76cd7
rc/com/android/bluetooth/btservice/AdapterService.java
976912e5f597f015754aa67f2a74040e27f58eab 23-Aug-2012 Syed Ibrahim M <syedibra@broadcom.com> Fix for BT crash during CPBR AT cmd processing

Delete the local reference of jstring objects during every callback
for unknown AT command and dial command after JNI calls the Java
methods.
Bug 7044655

Change-Id: I21792b95fbad37c488ec5a1a30521a5413192751
ni/com_android_bluetooth_hfp.cpp
ce0b8381a621aa5dbac9d44932c5293d980df4c8 20-Aug-2012 Martijn Coenen <maco@google.com> Merge "Don't trust length specified by ContentProvider for file transfers." into jb-mr1-dev
a8e40f542287f047a8a2fda7f5ea2aea9607edfe 14-Aug-2012 Ravi Nagarajan <nravi@broadcom.com> Notify headset of signal strength change

Battery and service state changes were relayed to the stack, but not
signal strength. This has been resolved.
bug 6983415

Change-Id: Ie6fbb108805348e39c9119d028afb834556ae6b0
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
ca6110d57998fee7c7b572ca29061ee99a82ba37 09-Aug-2012 Ganesh Ganapathi Batta <ganeshg@broadcom.com> Implement enableNoAutoconnect() for NFC handover

Implementation of BT enable in Quiet mode without initiating auto connect and not allowing
Incoming HFP, A2DP and HID connections.

Change-Id: I857aea8d95677f8287df4641ec0aeae58a9f7a99
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
rc/com/android/bluetooth/hid/HidService.java
44d87716fccf8ff6f114db72711388fa57068078 13-Aug-2012 Ravi Nagarajan <nravi@broadcom.com> listenForPhoneState only after SLC

Start phone state listener after SLC setup, instead of on
Disconnected SM exit(). On BT OFF, quitNow() forces a SM exit()
which incorrectly started the phone state listener. Additionally
no indicator updates should be sent prior to SLC setup
bug 6976119

Change-Id: Icff2bc52602230b098651225bec92d532f3a3ff9
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
fdc7bd89b00e40b459c706784fa003509a229096 03-Aug-2012 Martijn Coenen <maco@google.com> Don't trust length specified by ContentProvider for file transfers.

It seems that the length specified by content providers for images
is often not correct. This happens because applications modify the
images later on with meta-data, etc., but don't update the length
field.

This causes Bluetooth OPP transfers to fail, usually with an
IndexOutOfBoundException. The root cause (wrong size in content
provider) of course needs to be fixed, but we can also make
Bluetooth more resilient to these situations.

Since OBEX needs to know the transfer length
up front, the only other way we have of determining the size
of the content is by opening a file descriptor and getting
its length.

Bug: 6857704
Change-Id: Iaf2304b44e9e81ef6e6ac7e0fe3be84ad31a312f
rc/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
ef39cada04683dd7ef7b68c89a8722f2ce635c28 06-Aug-2012 Ravi Nagarajan <nravi@broadcom.com> Add unbond reason to bond state change intent

HAL sends the status to indicate the reason for bonding failure, if any.
Add this to bond state change intent, so that the Settings app can
display the error dialong, if necessary.
bug 6936335

Change-Id: Ide7c9e497bbfc6428b60c7a6de6e01ca538edfb8
rc/com/android/bluetooth/btservice/AbstractionLayer.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
73d192095093759688cccc896714f71fcee218d8 08-Aug-2012 Matthew Xie <mattx@google.com> Merge "Fix for BT turn on/off issues: NPE, FD/thread leaks, ANR." into jb-mr1-dev
15d36984a79d6e35c659edb0efdf929f0b526bd5 01-Aug-2012 Fred <fredc@broadcom.com> Fix for BT turn on/off issues: NPE, FD/thread leaks, ANR.

This fix addresses numerous BT on/off issues found from the CTS test.
Fixed fD/pipe leak in various state machine Looper objects by calling quit() function.
Fixed cursor leak in AtPhonebook.
Change Pbap to stop the RFCOMM listener on the STATE_TURNING_OFF instead of STATE_OFF.
Removed several cleanup() methods causing NPE.
Reduced RFCOMM listener timeout from 3 seconds to 300ms between retry.
bug 6834336

Change-Id: I52423343d8f52f65294af0143f373871a9874d77
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterState.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
rc/com/android/bluetooth/hdp/HealthService.java
rc/com/android/bluetooth/hfp/AtPhonebook.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
rc/com/android/bluetooth/hid/HidService.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/pan/PanService.java
rc/com/android/bluetooth/pbap/BluetoothPbapReceiver.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
4f5430babbc5a8f870e5a578a4ea3452f41dd97a 01-Aug-2012 Ganesh Ganapathi Batta <ganeshg@broadcom.com> Implement Profile Auto connection logic

Implement Profile Auto connection logic (moved from Settings App )in Bluetooth APK
to avoid Auto connection not happening if the Settings App is not running
As part of this implementation following features are implemented
1. Auto connection initiation during BT on OFF
2. Profile Auto connection priority management
3. Connecting Missing profile logic
4. Initialize Profile Priorities on Bond State Change

Change-Id: I12b7c190e28f043b4b008c9b48ac7e13aaf178e6
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterState.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
rc/com/android/bluetooth/hid/HidService.java
0322ae1f5e8ea55c391145e7925cb5962a97c11f 02-Aug-2012 Ganesh Ganapathi Batta <ganeshg@broadcom.com> Proper update of friendly name for a paired device.

Update friendly name for a paired device by properly initializing mAlias
member of DeviceProperties in Property Changed Callback() for remote device.
bug 6884149

Change-Id: I01d0679af4facfe6e92527f7618f4ff791928d0e
rc/com/android/bluetooth/btservice/RemoteDevices.java
b45486075acf191f99da6a5d4f69a6f7aeff65da 27-Jul-2012 Ganesh Ganapathi Batta <ganeshg@broadcom.com> Fix typo in PBAP Server name SDP record

Change-Id: Iff48e815987178597d93069ae3874ca903882e37
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
7ac24de2819e5e4140ab7ab264e7cfffed4d7398 18-Jul-2012 Ganesh Ganapathi Batta <ganeshg@broadcom.com> Do not accept connection from remote PANU if the local role is also PANU

Fix for BLTH01537991
Change-Id: Ieea143a5929217c7dc52c541e55ddf57077b244f
rc/com/android/bluetooth/pan/PanService.java
ea0b4f90cd08ec1e798eb8bae450e36155ddccfe 30-Jul-2012 Nick Kralevich <nnk@google.com> Explicitly export content providers

In a future version of Android, the default value for
<provider android:exported> will change from true to false.
Explicitly set android:exported="true"

Bug: 3306452
Change-Id: I4df74c627505c596a3bce81a5417d32e5002a75f
ndroidManifest.xml
15d72a0c3338645bcc409023150aec40b08aadc1 29-Jun-2012 Ravi Nagarajan <nravi@broadcom.com> Resolve incoming pairing and connection issue

When the remote side initiates pairing & connection, occassionally
connection is made before the phone has had a chance to do SDP.
In this case, the profile priorities are not initialized, which caused
us to incorrectly reject the incoming connection. Allow connection
if priority is undefined, but device is not unpaired

Change-Id: Icd8257adea19fc9a4d3853cd85da9bd791cfe505

Conflicts:

src/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
rc/com/android/bluetooth/hid/HidService.java
74a598e0a8d50343227e3f96bbe56c6be1c240f9 28-Jun-2012 Ganesh Ganapathi Batta <ganeshg@broadcom.com> Ensure mAddr member of DeviceProperties is properly set with device BD Addr

Change-Id: I5dafb48fc63dadfc5ad60e5a4e9735cf72d56534
rc/com/android/bluetooth/btservice/RemoteDevices.java
10bab53713ca13b3ccdaac5286c9b576e577be5e 25-Jun-2012 Swaminatha Balaji <swbalaji@broadcom.com> Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled

Change-Id: I15d3d6c8456e94553f479009c600dca1cd2361ac
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
caa3723eaa20e57aac086d54a41106108503debc 27-Jun-2012 zzy <zhenye@broadcom.com> Added code to ignore the empty value of remote device property change
Change-Id: I0d6b293c0bf35d9b4a2df00e9b3cd810c4a9b251
rc/com/android/bluetooth/btservice/RemoteDevices.java
6b19b0e94877ae8f0803133f8cfb4885acff2763 14-Jun-2012 Syed Ibrahim M <syedibra@broadcom.com> Virtual call implementation

Change-Id: I72a96eedd1cac10a0da7223ebc9b70fd4a21974d
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
81491a292e9f01007c0f291e7f6acd054f6dcb4c 18-Jun-2012 Priti Aghera <paghera@broadcom.com> HDP-App crash fix
Set the channel fd to null in channel state callback if new state is not CONNECTED

Change-Id: Id540d9ca2e20ef3e03b11a61634b8a2cb4e05df1
rc/com/android/bluetooth/hdp/HealthService.java
9fa44d91e9b352d0295ad7fd4c75b3cd8a220d70 20-Jul-2012 Ying Wang <wangying@google.com> Import translations. DO NOT MERGE

Change-Id: I1c99fc8291bddc2e9c318e0d7e8d5de516601161
Auto-generated-cl: translation import
es/values-fa/strings.xml
es/values-fa/test_strings.xml
fe0ac5b0476b628be11c93a818f342db90332ea8 20-Jun-2012 Matthew Xie <mattx@google.com> Notify Connection state chnage to AudioManager via an API call

bug 6834913
Change-Id: I58af46710320f3debee1780aeaea7f5548233604
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
5705f3a6c994b32ed9c50c21e9689108d2ec00fe 14-Jul-2012 Matthew Xie <mattx@google.com> Remove unused import com.android.internal.telephony.Call

Change-Id: I491dc175b29f98900b79e801ff3fb4f116752668
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
09a499140bc202cbf656730fe6888f753dcff5d0 13-Jul-2012 Matthew Xie <mattx@google.com> Add CONNECTIVITY_INTERNAL permission for PanService

Change-Id: I0e601eecdb1e7f52bc7ada037b1182b1a5a49f16
ndroidManifest.xml
57a3923845c46742ed4f03d49dbdbb6c774ccf90 12-Jul-2012 Matthew Xie <mattx@google.com> Removed onStartCommand().

BT ON/OFF now done via enable() and disable() binder API call.
Also fixed bug with BT OFF if set scan mode times out

Change-Id: Ib88dfc148bb5a24cda1e84a86f044ae85a5a6514
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterState.java
c55a9837c004044051b71bb47182ace156691283 07-Apr-2012 Matthew Xie <mattx@google.com> replace logx with alogx

Change-Id: Iec82cb4545bb26a8aa55dc7d473247396b9fd6e1

Conflicts:

jni/com_android_bluetooth_hid.cpp
ni/com_android_bluetooth_a2dp.cpp
ni/com_android_bluetooth_btservice_AdapterService.cpp
ni/com_android_bluetooth_hdp.cpp
ni/com_android_bluetooth_hfp.cpp
ni/com_android_bluetooth_hid.cpp
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
4603dc081506452854023a1c6eacdfca468e0dc4 12-Jun-2012 Matthew Xie <mattx@google.com> comment out state machine quit call

Change-Id: I0d4f72d50cd981a3c334583948dc0563f0662662
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterState.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/hfp/HeadsetService.java
e469f16e5a7d99471d7db1b216d422e8d12cc4cf 06-Jun-2012 Matthew Xie <mattx@google.com> matt: my fix to get it compile, change logx to alogx, and etc

Change-Id: I0b361ad6ba9a5f6ac4db9203a389ee309b04019a
ni/com_android_bluetooth_a2dp.cpp
ni/com_android_bluetooth_btservice_AdapterService.cpp
ni/com_android_bluetooth_hdp.cpp
ni/com_android_bluetooth_hfp.cpp
ni/com_android_bluetooth_hid.cpp
ni/com_android_bluetooth_pan.cpp
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/pan/PanService.java
179fd2512d1a93bbd2a1a3803f5764cb417fe4c9 11-Jun-2012 Kausik Sinnaswamy <kausik@broadcom.com> Add remote device while pairing without inquiry

Change-Id: Ia7d99075b196414b3ded117b323ca5295c2c0b73
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
2f9a79b2d545e1a8b50a0018456892a9934db99a 06-Jun-2012 Ravi Nagarajan <nravi@broadcom.com> Resolved incoming pairing/connection issue

Sending bond_state_changed and adapter_properties_cb concurrently was
causing a race condition, which resulted in the BOND_STATE_CHANGED intent not
being sent. This caused the Settings to not show the newly bonded
device. This has been resolved by letting BondStateMachine manage
the mBondedDevices

Change-Id: Ieba39602436370fd9a87c3aa938ff3bd724c68cf
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
579f67ec87646f840c1235eb62d99ab9fa11f23c 05-Jun-2012 Sreenidhi T <nidhit@broadcom.com> Additional check included for the case when PhoneApp queries Bluetooth Audio state before the stack responds for the sco disconnect issued previously in AudioOn state.

Change-Id: I8b85fc9d3b4463205f01dfaa3bb309a3dbeb8231
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
99a6ee18f09cf8e7ddff91d68267db21867b3cdf 31-May-2012 Syed Ibrahim M <syedibra@broadcom.com> Fix the issue where HID connection was failing on first connection randomly.
Made changes in HidService to send a STATE_CONNECTING broadcast when HIDService.connect() is invoked;
Also before rejecting the incoming connection, check if the connection is transitioning from STATE_DISCONNECTED to STATE_CONNECTED and then only do a disconnectHidNative(). The normal flow of HID connect would transition from STATE_CONNECTING to STATE_CONNECTED

Change-Id: Ia416e3a70fc6c3561c3530091691367c5da2674c
rc/com/android/bluetooth/hid/HidService.java
e479e18951a375a548e617e86e3b1b7d121351a1 25-May-2012 Fred <fredc@broadcom.com> Fixed PBAP to use simple pairing instead of numeric comparison (same as before).
Also, escape special characters in vCard-Listing XML object

Change-Id: I32eb126f3dba4b35af39e6e0636f2f7f7e8d94a8
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
8120c75b7a8b5a9c0e00df500c1ed072a952bda1 26-May-2012 zzy <zhenye@broadcom.com> Added code to cleanup connection state when bt off
rc/com/android/bluetooth/pan/PanService.java
a25e9c65c2a0192b7b3d819e2b87704f1942aa2f 21-May-2012 Sreenidhi T <nidhit@broadcom.com> Changing the order of notification of connection state change, as it was causing a race condition, with the UI not being updated with the correct connection state.

Change-Id: I6f4c75e4eac4ae798cb7918a4f1b7458e1eaa4b0
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
rc/com/android/bluetooth/hid/HidService.java
rc/com/android/bluetooth/pan/PanService.java
4a53a55dc10d3a26c94e5844f7d4a2565a67142c 19-May-2012 fredc <fredc@broadcom.com> Fixed displaying images in pbap browse and pull when configured

Change-Id: I8315d4db76d7cbfeaefe4187100984d12bd952ed
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
942da5b41b0c9e45e83e9801f80b982f1e4cd011 18-May-2012 Kausik Sinnaswamy <kausik@broadcom.com> Ensure that A2DP stream is suspended during Voice Dial when SCO
connection is established. This is needed to be compliant with the SIG's
AV+HF whitepaper

Change-Id: Ie072782ea70de0f1b13c6cf8bfcb88c072a1d093
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
755aa8f5359a933205552c40b6446b001ae42378 15-May-2012 Priti Aghera <paghera@broadcom.com> Fix for force closing HDP app: Included review comments
Included a callback to linkToDeath and notify the HealthService when BluetoothHealth is dead

Change-Id: Ie34a391f78c4fba0a74bcefd3dedccaa63f7bba3
rc/com/android/bluetooth/hdp/HealthService.java
75e9fd59f4d4011ba7155732a41b06f0df40bada 15-May-2012 Swaminatha Balaji <swbalaji@broadcom.com> Fix for A2dp/hf connection happening even when profile is disabled in Settings

Change-Id: I32145db12e0107b858e2e25ad1ae6cba6eadb55d
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
a7e8ef3f77ac74449f817f36f570a3545285be85 11-May-2012 fredc <fredc@broadcom.com> Added support for enabling/disabling profiles

Change-Id: I819ca7920d9d866bd3aca88d4365a18e2369ee81
ndroidManifest.xml
es/values/config.xml
rc/com/android/bluetooth/btservice/AdapterApp.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/Config.java
rc/com/android/bluetooth/pan/PanService.java
c181b8b49f5ad5b49b33334a9ba8f342ddb3545c 14-May-2012 Kausik Sinnaswamy <kausik@broadcom.com> Fix to ensure that we are able to pair with a device that was just unpaired. The fix was to clear a boolean variable which was causing some stale data to be maintained

Change-Id: Iaad0e21794b0b6e47d12c837ef36e026b6ece655
rc/com/android/bluetooth/btservice/BondStateMachine.java
d807ba48ed4418c1a60549abe1c3a98ced8c428d 14-May-2012 Sreenidhi T <nidhit@broadcom.com> Change done to clear mUuid - local copy of Uuid. If not cleared, the cachedBluetoothDevice issued a connect using the local cached copy of uuids, without waiting for the ACTION_UUID intent. This was resulting in multiple calls to connect().

Change-Id: Ida6fd2e805dee8c19b4d7d656b4102891f51fd00
rc/com/android/bluetooth/btservice/RemoteDevices.java
970baea8e58a7b537e76e8bcbba34f428cede061 12-May-2012 Priti Aghera <paghera@broadcom.com> Fixed HDP Disconnection issue. Included channel to list of channels when channel state callback is received

Change-Id: Icd361a3f19b883b3cca27fe9eb0cafc3b969290b
rc/com/android/bluetooth/hdp/HealthService.java
c7a57f31515107366589bd6875c3cc4af1fc806e 07-May-2012 fredc <fredc@broadcom.com> Added PBAP support for fetching owner vcard info from phone's profile. Added PBAP image support

Change-Id: Ieb2993c9505185d4f85cbbf6b5c554936618cff0
ndroidManifest.xml
es/values/config.xml
rc/com/android/bluetooth/Utils.java
rc/com/android/bluetooth/pbap/BluetoothPbapConfig.java
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
rc/com/android/bluetooth/pbap/BluetoothPbapUtils.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
4852c5686229f1014e9851f4e9a3a19547581b45 10-May-2012 fredc <fredc@broadcom.com> Moved BluetoothAdapter.ACTION_STATE_CHANGED broadcast from AdapterService to BluetoothManagerService

Change-Id: Ic9911359c1d9e04a5d803807ea7cf4ad39616960
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterState.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
74ae04c73312403e89db0f8e9bd9601d403b4783 07-May-2012 fredc <fredc@broadcom.com> Fixed memory leak in Binder objects from repeatedly turning on/off Bluetooth

Change-Id: Ibee5382816d47b1e9b846461942a9daccc4210a7
rc/com/android/bluetooth/Utils.java
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/btservice/AdapterApp.java
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterState.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/btservice/JniCallbacks.java
rc/com/android/bluetooth/btservice/ProfileService.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
rc/com/android/bluetooth/hdp/HealthService.java
rc/com/android/bluetooth/hfp/AtPhonebook.java
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
rc/com/android/bluetooth/hid/HidService.java
rc/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
rc/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
rc/com/android/bluetooth/pan/PanService.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
ce4edb8ed132976651b32b337f3d90e1a170afa9 08-May-2012 Sreenidhi T <nidhit@broadcom.com> Changes done for disconnecting sco connection based on disconnectAudioNative() return status, instead of waiting till BTA_AG_AUDIO_CLOSE_EVT is received. The delay in disconnecting sco was causing audio to be routed to earpiece instead of speaker, when selected from incall screen.

Change-Id: I307c3e9c114676649750cb64f1043fc7fe79d71b
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
405b6148a168c05f9c9eac6a80db68b9a58392e2 27-Apr-2012 Sreenidhi T <nidhit@broadcom.com> Added AT+CPBR support

Change-Id: Ice860d8f97350d805a5478e94a27ae19cf42dafd
ni/com_android_bluetooth_hfp.cpp
rc/com/android/bluetooth/hfp/AtPhonebook.java
rc/com/android/bluetooth/hfp/BluetoothCmeError.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
ac7e62c64b4cd8d864f125d3225474a04b867606 27-Apr-2012 zzy <zhenye@broadcom.com> Added code to turn off pan connection when tethering state changed
rc/com/android/bluetooth/pan/PanService.java
d288c0dac06748780916bf438b7c84482545672f 26-Apr-2012 fredc <fredc@broadcom.com> Backed out workaround for RFCOMM socket close issue when BT is turning off

Change-Id: I793fa2a0fa0127b6ff70aeb448c97c3cc9154d6f
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
31ba132491053bc86d419a7d51fc04af3299c076 26-Apr-2012 fredc <fredc@broadcom.com> Fixed Bluetooth on/off issues. Removed singleton instances causing issues when services reload. Updated adapter state machine

Change-Id: Ie1ff4284f507c7da102569f3c0acfd55612a5f6b
rc/com/android/bluetooth/btservice/AdapterApp.java
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterState.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/btservice/JniCallbacks.java
rc/com/android/bluetooth/btservice/ProfileService.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
7aab11364743cbca6eeefecbbde19f0434aff362 24-Apr-2012 fredc <fredc@broadcom.com> Fixed exception in BondStateMachine when quit message occurs. Fixed exception in OPP when remote does not accept incoming request.

Change-Id: Ibb43a26ee0ac62967518468d243880a0af987ba0
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
68e7fc4f2c62ebc76e86109a919592ad25ec11d7 24-Apr-2012 Ravi Nagarajan <nravi@broadcom.com> Handle NREC. On connect, enable echo cancellation locally, headset will then override it

Change-Id: I8fca1e82d1457b47122c17393ffbff362e1f3134
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
01a8cf98f070a6996b2e8974edc229ac402f3f0c 03-Apr-2012 Kausik Sinnaswamy <kausik@broadcom.com> Added ACL connect/disconnect state callbacks

Change-Id: Ibd44de8601521a11b106711ccad9261fb40beca8
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/btservice/AbstractionLayer.java
rc/com/android/bluetooth/btservice/JniCallbacks.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
b8a77aa1b386baaf6381f7b356b9485673e1f942 20-Apr-2012 Ravi Nagarajan <nravi@broadcom.com> On disable send the disable event to stack right away, as the stack will take care of tearing down the active connections. ALL_DEVICES_DISCONNECTED was not being sent (as no profiles handled it), causing 3 second delay on BT off

Change-Id: I8aa83f3cd2019f521d5522e9455303a413dddcc1
rc/com/android/bluetooth/btservice/AdapterState.java
6de8229571ce56dcb0010c63cbef65e01ecd5c2a 22-Apr-2012 Priti Aghera <paghera@broadcom.com> Fixed random pin generation for pairing with HID keyboard

Change-Id: I7e6fd39289c6c5ebefd94f45e24de86e6aeaa625
rc/com/android/bluetooth/btservice/RemoteDevices.java
b5cc776c9353a203cdde97e62b25f05d9633d14c 19-Apr-2012 fredc <fredc@broadcom.com> Fixed BT on/off issue

Change-Id: I47cbac9fc694d5604a664f20170eeed90eeee8e6

Conflicts:

jni/com_android_bluetooth_btservice_AdapterService.cpp
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterState.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/btservice/JniCallbacks.java
rc/com/android/bluetooth/btservice/ProfileService.java
rc/com/android/bluetooth/hdp/HealthService.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hid/HidService.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/Constants.java
rc/com/android/bluetooth/pan/PanService.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
1404ab28fd296373a98b766b0b01193985446eab 21-Apr-2012 Harish Paryani <hparyani@broadcom.com> Added a comment

Change-Id: Ia52a0f58ee2085f3452877e23a591dcd842bafac
rc/com/android/bluetooth/hid/HidService.java
522003462124b08ef9345a6778df4089d202d6fa 20-Apr-2012 Harish Paryani <hparyani@broadcom.com> Corrected a comment

Change-Id: I365bf2dd835385629b7e7bbff649e9fdd6646db8
rc/com/android/bluetooth/hid/HidService.java
42a6e53f2ec04cbd78fea952fc926fdf3e5b8cd9 19-Apr-2012 Ravi Nagarajan <nravi@broadcom.com> Connection state change has to be handled in AudioOn state. Some headsets send RFCOMM disconnect prior to disconnecting the SCO. In this case the state machine has to handle the connection state change

Change-Id: Ib80a49cbd959055624baae6e5a35022c628f4bba
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
3fafe61ef25c1899fdc817c52163aec16c31055c 19-Apr-2012 Ravi Nagarajan <nravi@broadcom.com> Memory profiling changes : Updated the Bluetooth code to handle cleaning up of object references (context, handlers, and collection objects ) during service cleanup.Memory profiling changes : Updated the Bluetooth code to handle cleaning up of object references (context, handlers, and collection objects ) during service cleanup.

Change-Id: I2b0235f71c1feaf32215b2aaf89a2e06d8fa7d73
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/btservice/AdapterState.java
rc/com/android/bluetooth/hdp/HealthService.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
rc/com/android/bluetooth/hid/HidService.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/pan/PanService.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
ac234ef0ddd67471d82f77c41535a5ea1b68b443 19-Apr-2012 Kausik Sinnaswamy <kausik@broadcom.com> Added support to handle A2DP audio state changed events and broadcast
A2dp API intents

Change-Id: I1938e5e0acbbaf602239e14e1dfd3c890712930a
ni/com_android_bluetooth_a2dp.cpp
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
bbbfba6398ac613896a4456fae1c9bf909c28bf2 18-Apr-2012 Ravi Nagarajan <nravi@broadcom.com> Handle the scenario where the phone number is empty. CLCC should not send number & type if number is NULL

Change-Id: I5a5bde4f1493d05f02ea9246e36b5d849e96bef2
ni/com_android_bluetooth_hfp.cpp
404743adf7bde44df9c8571f7890bc11f613d7ae 17-Apr-2012 Kausik Sinnaswamy <kausik@broadcom.com> BT icon not getting updated on profile connection due to incorrect handling of the prevState

Change-Id: Ibd3836047faebcaacb335898cc3d7392ab7571f4
rc/com/android/bluetooth/btservice/AdapterService.java
de396a46388269221b05dae2760be63fe7254748 16-Apr-2012 Kausik Sinnaswamy <kausik@broadcom.com> Clear BT Interface pointer during cleanup for BT on/off cycles to work

Change-Id: I89cdf7714c78b2b8dcbcdc6e78cd2500f85df986
ni/com_android_bluetooth_pan.cpp
9a0efb0ee8c63797280b3b9309782541134e9205 16-Apr-2012 fredc <fredc@broadcom.com> adapter non persistent service. Fixed null exception when profile services connect/disconnect

Change-Id: Iefafd1115471256d3107f039897e2af16077cdae
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/hdp/HealthService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
rc/com/android/bluetooth/hid/HidService.java
rc/com/android/bluetooth/pan/PanService.java
6654f5c903de510a70f9e72cd5ad7837b615d93f 12-Apr-2012 fredc <fredc@broadcom.com> Non persistent adapter service

Change-Id: I65e1c18e2899cea0a1e5c0102c4d24d39dce0249

Conflicts:

jni/com_android_bluetooth_hdp.cpp
jni/com_android_bluetooth_hid.cpp

Conflicts:

jni/com_android_bluetooth_hid.cpp
ndroidManifest.xml
ni/Android.mk
ni/com_android_bluetooth.h
ni/com_android_bluetooth_a2dp.cpp
ni/com_android_bluetooth_btservice_AdapterService.cpp
ni/com_android_bluetooth_hdp.cpp
ni/com_android_bluetooth_hfp.cpp
ni/com_android_bluetooth_hid.cpp
ni/com_android_bluetooth_pan.cpp
rc/com/android/bluetooth/Utils.java
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/btservice/AdapterApp.java
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterState.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/btservice/JniCallbacks.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
rc/com/android/bluetooth/hdp/HealthService.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
rc/com/android/bluetooth/hid/HidService.java
rc/com/android/bluetooth/pan/PanService.java
rc/com/android/bluetooth/pbap/BluetoothPbapReceiver.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
990b2cd65392bc6db58eda732ad41de22b713202 12-Apr-2012 Priti Aghera <paghera@broadcom.com> Patch for inconsistent pair-unpair state

Change-Id: I356cd978c6b30b415a94267c9e535dc0297d6540
rc/com/android/bluetooth/btservice/AdapterProperties.java
edb14a4944d66ca9255b2ab9b384c583b626fd94 11-Apr-2012 Syed Ibrahim M <syedibra@broadcom.com> Fix for memory leak in AdapterSertvice.cpp : The native jobjectArray and jintArray instances are being declared and de-referenced in adapter_properties_callback() and remote_device_properties_callback() methods but is being initialized in get_properties() method. Becasuse of this, when the get_properties() method returns, VM looses reference to the native instances and hence leading to memory leak.

Change-Id: I48944887903a492a40cb95f5f79a56b9d58f85fa
ni/com_android_bluetooth_btservice_AdapterService.cpp
206363c7e1d2a7eb116aa6559c83431cd3f55def 11-Apr-2012 Ravi Nagarajan <nravi@broadcom.com> AT Response needs to be send for CNUM

Change-Id: Ia6aa0e91bc42b9a77143087f65b95c81117b9e3c
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
aa90f0cbb860434c5310ae6bfa16987834f582f0 11-Apr-2012 Priti Aghera <paghera@broadcom.com> Patch to fix getBondedDevices and inconsistent pair state

Change-Id: Idaf2a18dcaaaca422d3d5ee9245dbfa75cbbb96c
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
57addccaa75691f8eb6f35204d608a63695a9705 09-Apr-2012 Priti Aghera <paghera@broadcom.com> HID-PTS:Included API and calbabkcs for hid pts tests

Change-Id: I7f3b19dbcda24dbb0cd4700a54f7cd05e84d3745
ni/com_android_bluetooth_hid.cpp
rc/com/android/bluetooth/hid/HidService.java
d570893c5ec3bc9fd1860aa0355c550d3a51f8dd 09-Apr-2012 Kausik Sinnaswamy <kausik@broadcom.com> Improve BT enable/disable stability under stress tests

Change-Id: Ie6323a225b5e1ccd1ad9f65e90b144c93b957a8b
ndroidManifest.xml
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/AdapterState.java
25ec7de5ff422f50f3dbfd0822423c85b47f4794 09-Apr-2012 Ravi Nagarajan <nravi@broadcom.com> Implement the getDevicesMatchingConnectionStates for A2DP

Change-Id: Icf5b14d13c4ee6564876aac529e992a22747ac41
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
c55ac7d42cf2d78c7edc67abf6c66813245b2c93 06-Apr-2012 fredc <fredc@broadcom.com> Added support for BluetoothDevice.fetchUuidsWithSdp()

Change-Id: Icd260b0cafd7fee72a7ad0275b62052257c6fc13
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
19da573973557408b1b7398a2c3a167d8da9527d 04-Apr-2012 Srikanth Uppala <suppala@broadcom.com> Fix discoverability timeout issues. (a) implement timeout logic (b) persist 'never timeout' after reboot (c) code cleanup

Change-Id: I9313277c39c69f90d0b0556cf24d9c30a774a0a6
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
89d2a16ff98d1b6254139e1589404161d5c419c7 04-Apr-2012 Priti Aghera <paghera@broadcom.com> Fixed checkCallbck thread so that callback env is always intitialized

Change-Id: Id959c99a0aa7823d36a0437d0b59972052f3edb9
ni/com_android_bluetooth_hid.cpp
8826b161f865350f306e8f287aaca615e2f1e4a3 04-Apr-2012 Matthew Xie <mattx@google.com> check device.mAlias null case before copying to it

Change-Id: I705126ce11272d9c3a5577c0266982a6478e8a87
rc/com/android/bluetooth/btservice/RemoteDevices.java
9f0d856f41d443ec23d5aa2eecfc561d7a3c01d1 31-Mar-2012 fredc <fredc@broadcom.com> Initial checkin of OPP and PBAP

Change-Id: Ie43a26874bd5f0c00d69c2ce02430f4a16da327a
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
0708fe3087b690439dd9745b2cf1a96f29f570b0 04-Apr-2012 Syed Ibrahim M <syedibra@broadcom.com> Updated the AdapterState class to handle persisted Bluetooth setting after AIRPLANE MODE OFF event

Change-Id: I5e1ca111b72ff49498e87149c32769997e545c54
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterState.java
cc80b2261351dc74ad1bed237b0423c12d340514 14-Mar-2012 Matthew Xie <mattx@google.com> initial check in of rfcomm socket implementation Author: Zhenye Zhu, Matthew Xie

Change-Id: Ie3ab12c3bafc0a44e378a31c426c5eb41192f154
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/Utils.java
rc/com/android/bluetooth/btservice/AbstractionLayer.java
rc/com/android/bluetooth/btservice/AdapterService.java
676cb1bdd1c14c7af56562bab51f168e7f8f6d62 23-Mar-2012 Matthew Xie <mattx@google.com> Initial implementation of hdp service and jni

Change-Id: Ieca906080835098383cabbc13fa914363459f555
ndroidManifest.xml
ni/Android.mk
ni/com_android_bluetooth.h
ni/com_android_bluetooth_btservice_AdapterService.cpp
ni/com_android_bluetooth_hdp.cpp
ni/com_android_bluetooth_hfp.cpp
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/hdp/HealthService.java
f8d98da947bbb9e2380a60df89acbcbd4ca680af 03-Apr-2012 Kausik Sinnaswamy <kausik@broadcom.com> Fixed incorrect handling of the RSSI during inquiry which causes the devices to not get sorted properly.

Change-Id: Ib4eca5405a3393aef79f43943853adf76da23e76
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/btservice/AbstractionLayer.java
8f8e1bdc4dfc5d9d974b0e0b01dbe981707c9c6f 30-Mar-2012 Ravi Nagarajan <nravi@broadcom.com> ATD commands have a trailing ';'. Remove the trailing ';' prior to dialing a call. Else a send tone popup is received.

Change-Id: Icbd53166001d3be102bac6a8d2f782cb22c4dc56
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
b01cf4299897d227c7dbcbe4981b63a1ffe4ffca 30-Mar-2012 Sreenidhi T <nidhit@broadcom.com> Fixed the pairing variant check typo.

Change-Id: I1a835531bc35cc6b1a178a0d131a86715df6f3f0
rc/com/android/bluetooth/btservice/RemoteDevices.java
5f1bee8200197a49d8ffc49fe3e91d19c927ff52 28-Mar-2012 Ravi Nagarajan <nravi@broadcom.com> Resolved HSP PTS issues. When call is active, and CKPD is received: 1. If audio is not ON, audio will be enabled 2. If audio is ON, call with be disconnected (fixed a typo here, which answered the call, instead of hangup)

Change-Id: Ib60f7109f9fe982523c3db68ea6014c25bad8262
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
b18d6a7da48a6847df88abadd42fbb51316cb76d 27-Mar-2012 Ravi Nagarajan <nravi@broadcom.com> Integrate HFP with VR app. Handle both cases where VR is started by peer as well as launched from the phone

Change-Id: Icf2922f4caf20190fdb3f0afa2ddd19d1852c4fb
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
35207a5638f61caca5b9abb31e5c6850a9478a52 22-Mar-2012 Matthew Xie <mattx@google.com> initial implementation of hid service and jni

Change-Id: I527651bd85ad3adddbf4b89802f4a6128c9fa047
ndroidManifest.xml
ni/Android.mk
ni/com_android_bluetooth.h
ni/com_android_bluetooth_btservice_AdapterService.cpp
ni/com_android_bluetooth_hid.cpp
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/hid/HidService.java
93f548ff8560bdecdc4bdd2f91f7dacda1e6bbc3 21-Mar-2012 Kausik Sinnaswamy <kausik@broadcom.com> Caching callbackEnv in HFP/A2DP JNI results in the ENV going out-of-syn after an disassociate_evt/associate_evt sequence. Removed the caching.

Change-Id: Iebe3d2b3fa632c3332be82291bf32ace62c30ad5
ni/com_android_bluetooth_a2dp.cpp
ni/com_android_bluetooth_hfp.cpp
345d21b0575a4b866bfc9ccfde9c654e7b859ac6 20-Mar-2012 Matthew Xie <mattx@google.com> Fix persistent audio on, Donot connect_audio when enter CONNECTED state. Process DISCONNECT message in AudioOn state.

Change-Id: Id89842ff2179234c320752ae69dcf3c99b125bce
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
bcbeaf69468424800a939b3e8678eaef21efa3d6 09-Mar-2012 Matthew Xie <mattx@google.com> process slc_connect state change event, query and send stack the phone state

Change-Id: I4472384290d87f13f7be5647327c789c01582a7b
rc/com/android/bluetooth/hfp/HeadsetHalConstants.java
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
ab1a751670c1bceb23f3cf880f6ad9421c0487c2 19-Mar-2012 Matthew Xie <mattx@google.com> Revert "fix persistent audio on, Donot connect_audio when enter CONNECTED state"

This reverts commit 3ce52a01d734e73a21074ab8397cf67b16d6595f

Hi Matt,
I reviewed your changes (2), and they look good. However, your changes in (1), seem to be causing a side-effect while testing the headset connection setup while call is active/outgoing/incoming. Since this change was merged, I am sending my comments thru email.
Here is the scenario
1. No headset connection

2. Place an outgoing call, and answer it at the remote side

3. Initiate connection from headset

4. SCO seems to be setup by Java side even before SLC setup completes

ISSUE#1: Once Java receives connection event, it automatically calls connect_audio, even though SLC has not been setup
ð Can you make a change to call connect_audio, only after SLC is complete? If this difficult to do, can this code just be removed, as the stack will do automatically after SLC setup when phone_state_change is called

ISSUE#2: If we redo this for an outgoing call (call answered prior to headset connection), then the Java side does not initiate SCO audio
ð To have a consistent behavior, if Java side is setting up SCO for active call, shouldn’t we be doing the same for outgoing call too?

Thanks
Ravi
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
53b834a8a7f9f077ff751ade222d2f81d9d6fdad 09-Mar-2012 Matthew Xie <mattx@google.com> fix persistent audio on, Donot connect_audio when enter CONNECTED state

Change-Id: Ieb2c327ab562c02f293fa616e555ed5a8dc55570
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
47ead0fdf1786e6f0c5bde1c6b1b40b08168edb9 10-Mar-2012 Matthew Xie <mattx@google.com> output call back event information

Change-Id: I6a84a19f91fbb102668745623327f7e234c2ad5d
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
f0b6639617ce2245ffb88968e8a864d0fa99dd8c 09-Mar-2012 Matthew Xie <mattx@google.com> Save volumes and notify stack only when they change

Change-Id: Ibcf6a55111ee3d6ecab6ecd75ab957258b35e49c
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
986b5b03a378385bfea6c5cc6b6c1d7f0424e0a5 09-Mar-2012 Ravi Nagarajan <nravi@broadcom.com> Added new state BT_BOND_STATE_BONDING. Stack will send a callback for all three states, app does not have to rely on the api return code to switch to bonding. This addresses the incoming pairing as well as the remote unpaired test cases

Change-Id: I37208e5bae7264a0ff78195322ba0a6bd1d82f0f
rc/com/android/bluetooth/btservice/BondStateMachine.java
9b300c1a33952a22c3bba1521da2d01cbf607b7b 08-Mar-2012 Matthew Xie <mattx@google.com> update call state to match hf hal header, memory dial fix null pointer

Change-Id: I62f26d0259a910ac80d7a18c6bef49abb6eab820
rc/com/android/bluetooth/hfp/HeadsetHalConstants.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
6c91bc0a163cc7600c40d7fb979777fd911d1ef1 17-Feb-2012 Matthew Xie <mattx@google.com> Initial implementation of HFP and A2DP profile/service/statemachine.

Change-Id: Ic6e6d358b94313f237b7be61b70dcc6f4f7902e7
ndroidManifest.xml
ni/Android.mk
ni/com_android_bluetooth.h
ni/com_android_bluetooth_a2dp.cpp
ni/com_android_bluetooth_btservice_AdapterService.cpp
ni/com_android_bluetooth_hfp.cpp
rc/com/android/bluetooth/a2dp/A2dpService.java
rc/com/android/bluetooth/a2dp/A2dpStateMachine.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/hfp/AtPhonebook.java
rc/com/android/bluetooth/hfp/HeadsetHalConstants.java
rc/com/android/bluetooth/hfp/HeadsetPhoneState.java
rc/com/android/bluetooth/hfp/HeadsetService.java
rc/com/android/bluetooth/hfp/HeadsetStateMachine.java
1444b5b09d07b1ad5ec2ce89b4267484be25e8bf 07-Mar-2012 Jaikumar Ganesh <jaikumar@google.com> Incoming pairing issue.

Change-Id: Idd77d49a9d6df94e6dc9dfe4f179e93641d48261
rc/com/android/bluetooth/btservice/RemoteDevices.java
b9122437dc3562f8306b1c8bc97124dc8c33ae45 07-Mar-2012 Jaikumar Ganesh <jaikumar@google.com> Fix Bond State Machine device list.

The device list was adding the device twice.
Note: This whole class should be removed and moved to
the stack.

Change-Id: I6086ee98bd1b4088a90b76f67a9fff21987f4b04
rc/com/android/bluetooth/btservice/BondStateMachine.java
44abcd2791995793a5de09906b0ce6ed51bb6080 07-Mar-2012 Jaikumar Ganesh <jaikumar@google.com> Set scan mode to be connectable when turning on.

If scan mode is not set, set it to be connectable.

Change-Id: I146505dade5d46aa70068cdaada94c06f30d75de
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterState.java
fba70fe2abecf70b9f9f7ee09a21cbfc6cb73998 07-Mar-2012 Jaikumar Ganesh <jaikumar@google.com> Add ability to persist Bluetooth state.

Currently, BT is turned on when the Service is started,
if needed. This needs to be changed when BT is not a persistent
process.

Change-Id: I1c36aa75824622a739241d6d4e9aeacbf46e56af
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterState.java
b7e70fcf8923b9452074b2b4ee685da424cc7d93 07-Mar-2012 Kausik Sinnaswamy <kausik@broadcom.com> Merged the Passkey request callback and the passkey reply APIs into the SSP API and callback respectively

Change-Id: I2b8fb1665586d32b0ada1b882cbde1d232233803
rc/com/android/bluetooth/btservice/AbstractionLayer.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
0de39b78f48d8c5fc8455a19c29fa48a0bc0b229 07-Mar-2012 Chia-chi Yeh <chiachi@android.com> Bluetooth: declare shared libraries as its build dependencies.

Change-Id: I9999051d31fe8d8387d0002275a15be53ea02c30
ndroid.mk
581bb31a8165ff0f9c7d638cfe4a81aaaafa2ded 06-Mar-2012 Jaikumar Ganesh <jaikumar@google.com> Remove passkey callback.

Use ssp callback for all 3 forms of 2.1 pairing.

Change-Id: I13af1eecc3469e4db8e656717700a1f9166177e3
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/btservice/AbstractionLayer.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/JniCallbacks.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
fe90735bb6280ccaceb8a0a990781a810a2dd33e 07-Mar-2012 Jaikumar Ganesh <jaikumar@google.com> Fix scan mode bug.

The incorrect paramter was being passed.

Change-Id: Icc119811d61ffa537b837a6712a85ea9dcefaa87
rc/com/android/bluetooth/btservice/AdapterService.java
61c4100eb0606f8ba630f5c45d07a88d612fbc85 29-Feb-2012 Matthew Xie <mattx@google.com> Correct the length of bd_address setting.

The length of name was used to set address. This caused a index out
bound exception in pinReqestCallback.

Change-Id: Ia152f370470f14f9770d734ca7572ec8e8c5b8b3
ni/com_android_bluetooth_btservice_AdapterService.cpp
a11b96dc47dd07c531aa4cc600fb4d9295b71cce 27-Feb-2012 Jaikumar Ganesh <jaikumar@google.com> Add NET_ADMIN permission.

This is needed as the shared library
talks to the rfkill interface.

Change-Id: Id9fdc809ac8077240e57d9a7a46bb23913a40940
ndroidManifest.xml
ff68148a7fb74947ea5e7a337161108363cbe9f5 21-Feb-2012 Jaikumar Ganesh <jaikumar@google.com> Fix Bluetooth enable issue.

The stack sends all the property changes,
before sending enable. Hence, we don't need to
wait anymore.

Also fix the return value check for get_property.

Change-Id: Icac32cd74f9028c40ab6b5018b576168c9dac3b9
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/btservice/AdapterState.java
f91e79cef5efc47bd37ecb98dd2a60285bb45f8b 17-Feb-2012 Jaikumar Ganesh <jaikumar@google.com> Fix makefile for jni directory build.

Change-Id: I47bf6e955517ffdbd914ee3c1d87565d0cc3f3a4
ndroid.mk
ff4f17bf64978d0738c66e1b6dd70be8664efc24 20-Dec-2011 Jaikumar Ganesh <jaikumar@google.com> Initial commit for new Bluetooth stack interface.

1. Changes to Android.mk file
2. changes to make the process persistent. This is temporary.
3. Addition of new java and jni classes.

Change-Id: I2453c7a1a475c66bf52f3a84cd8beb12dd37b87a
ndroid.mk
ndroidManifest.xml
ni/Android.mk
ni/com_android_bluetooth_btservice_AdapterService.cpp
rc/com/android/bluetooth/Utils.java
rc/com/android/bluetooth/btservice/AbstractionLayer.java
rc/com/android/bluetooth/btservice/AdapterProperties.java
rc/com/android/bluetooth/btservice/AdapterService.java
rc/com/android/bluetooth/btservice/AdapterState.java
rc/com/android/bluetooth/btservice/BondStateMachine.java
rc/com/android/bluetooth/btservice/JniCallbacks.java
rc/com/android/bluetooth/btservice/RemoteDevices.java
2a6bf35f603d12e6533a69c773ac258b0e84941f 02-Feb-2012 Jaikumar Ganesh <jaikumar@google.com> Comments opp and PBAP init code when BT gets enabled.

Change-Id: Id1b9329cb4dba7f4d4e5f478a775bcfd18a68a66
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
679f3a8b86b9777ebd5f07bd3a069571ba5f727b 17-Jul-2012 Matthew Xie <mattx@google.com> Merge "Revert "first patch of test submit""
1eb1a249ee36c3e037355cce6d50511864dc0e7f 17-Jul-2012 Matthew Xie <mattx@google.com> Revert "first patch of test submit"

This reverts commit 1429606cdb0c5b4410a224697e0ac2459ebe4cb7
rc/com/android/bluetooth/opp/BluetoothOppBatch.java
79da1ea11a53df8eda738518c65d299f0f2e9a26 17-Jul-2012 Matthew Xie <mattx@google.com> Merge "Revert "second patch of test submit""
146a1c32ab5fd4b33b61a1b3ef167a2e97c6b624 17-Jul-2012 Matthew Xie <mattx@google.com> Revert "second patch of test submit"

This reverts commit 4b3b8ab47daf6cddf3bfa00c418ea436bc4cecb8
rc/com/android/bluetooth/opp/BluetoothOppBatch.java
f49092704f16b457233ab01679113c4b364689c9 17-Jul-2012 Matthew Xie <mattx@google.com> Revert "third patch of test submit"

This reverts commit 448de2e7f9e33c099207c80a8135f7a125b995f6
rc/com/android/bluetooth/opp/BluetoothOppBatch.java
448de2e7f9e33c099207c80a8135f7a125b995f6 16-Jul-2012 Matthew Xie <mattx@google.com> third patch of test submit

Change-Id: If555a371dd602034e06d8887cb37b457d2b22c40
rc/com/android/bluetooth/opp/BluetoothOppBatch.java
4b3b8ab47daf6cddf3bfa00c418ea436bc4cecb8 16-Jul-2012 Matthew Xie <mattx@google.com> second patch of test submit

Change-Id: Ib78a55ac1355e65b1db85a87f6e18006f0553be9
rc/com/android/bluetooth/opp/BluetoothOppBatch.java
1429606cdb0c5b4410a224697e0ac2459ebe4cb7 16-Jul-2012 Matthew Xie <mattx@google.com> first patch of test submit

Change-Id: Ief4f86f471ac62b11b9dcd4cae937d7fb261ba69
rc/com/android/bluetooth/opp/BluetoothOppBatch.java
51b28595a9166b8de33870b5b96252b5f346d99f 16-Jul-2012 Ying Wang <wangying@google.com> Import translations. DO NOT MERGE

Change-Id: Ia17635574edaa85a69282d79dfeeabe1d2b45785
Auto-generated-cl: translation import
es/values-fa/strings.xml
f9cbe2186684a813016798a3937cce13d826de0e 13-Jul-2012 Ying Wang <wangying@google.com> Import translations. DO NOT MERGE

Change-Id: I0b52f5f3648c7fc487423a36179ae027fc59be27
Auto-generated-cl: translation import
es/values-fa/strings.xml
1c70a54a1b568f646cff3d5b977e2a20a2a181b2 19-Jun-2012 The Android Open Source Project <initial-contribution@android.com> am c653f73b: Reconcile with jb-release

* commit 'c653f73b28986a82f60a4ce7cf6741316a835229':
c653f73b28986a82f60a4ce7cf6741316a835229 19-Jun-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-release

Change-Id: I6f6cabff925336ddccc4af80658712c63401e123
e6d43f2e625f9481cad3b0e30817f02dfe5f964e 18-Jun-2012 Matthew Xie <mattx@google.com> am 9544eed6: am 5cb59523: Change timestamp type from int to long, timestamp(now) overflows int

* commit '9544eed6411624e1a4df7039578cd076ae871540':
Change timestamp type from int to long, timestamp(now) overflows int
c8252c47963a3d0cf9277ae3cf0f788295ff0d8a 18-Jun-2012 Ying Wang <wangying@google.com> Import translations. DO NOT MERGE

Change-Id: I656294308cdf985be3d66707e8e861fc2f29a82f
es/values-tr/strings.xml
9544eed6411624e1a4df7039578cd076ae871540 18-Jun-2012 Matthew Xie <mattx@google.com> am 5cb59523: Change timestamp type from int to long, timestamp(now) overflows int

* commit '5cb59523d7d7e25c58bd99c100c50e49c78481ce':
Change timestamp type from int to long, timestamp(now) overflows int
21bc58521f9dd4c4c78fd2b828fba4076fdce8c1 16-Jun-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
5cb59523d7d7e25c58bd99c100c50e49c78481ce 15-Jun-2012 Matthew Xie <mattx@google.com> Change timestamp type from int to long, timestamp(now) overflows int

BluetoothOppNotification NotificationItem.timeStamp is int, too
small to be a timestamp
bug 6670668

Change-Id: Ieec5377bac3b8c7fbaa24d059ad5957ba9a0544f
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
3e1c5e99e4858f64865667de3c4e8908bc6643ab 11-Jun-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: Ie6a90b13c2e2072d82a1f165d680d390a9963fae
es/values-cs/strings.xml
c674d7211de0b640a027d31b1d89e99b6abe8332 29-May-2012 The Android Open Source Project <initial-contribution@android.com> am 2a7e29a4: Reconcile with jb-release

* commit '2a7e29a49148e428f32576a65efffc91f6332bfe':
2a7e29a49148e428f32576a65efffc91f6332bfe 29-May-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-release

Change-Id: I864bf6c218289fd89744dfba369fb2941c829bb6
b1d709560fca799ff0e5ed4a94b4e674f3caa812 29-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
9f667a3304be4b38982ba59562aca88bb1e26ff0 26-May-2012 Martijn Coenen <maco@google.com> am 5c39fcdf: am 03f25a20: Bluetooth OPP: Allow sending all mime-types for handover.

* commit '5c39fcdf7499aa3a2f94e29c6c99594620cb3c78':
Bluetooth OPP: Allow sending all mime-types for handover.
5c39fcdf7499aa3a2f94e29c6c99594620cb3c78 26-May-2012 Martijn Coenen <maco@google.com> am 03f25a20: Bluetooth OPP: Allow sending all mime-types for handover.

* commit '03f25a2055e51bcc5e8870642763b502956b6830':
Bluetooth OPP: Allow sending all mime-types for handover.
4a4888036d6833e0f095a46de8d7c55bf214a268 25-May-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I26e9934bdf128b172cd556afe5c011dfddad0b28
es/values-cs/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
03f25a2055e51bcc5e8870642763b502956b6830 18-May-2012 Martijn Coenen <maco@google.com> Bluetooth OPP: Allow sending all mime-types for handover.

This change allows sending of all mime-types through
ACTION_HANDOVER_SEND and ACTION_HANDOVER_SEND_MULTIPLE.
These intent actions are only used by NFC when doing
handover transfers, and require the whitelisting
permission that is only granted to system applications.

Similarly, for receiving, we will still reject certain
mimetypes, except if the transfer was whitelisted because
it was a handover transfer.

At this moment, only the NFC service has the signature
permission required for whitelisting.

This change also allows to send files without extension,
as long as OPP has a valid mimeType. This is useful when
using OPP in combination with a content provider, which
may specify filenames without any extension but with a
valid mime-type.

Bug: 6561169
Change-Id: Ia39418de6bcb2f8af678c7b8637b63b1697eb493
ndroidManifest.xml
rc/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
rc/com/android/bluetooth/opp/BluetoothOppReceiveFileInfo.java
rc/com/android/bluetooth/opp/Constants.java
31d75ce50849d2ee78f5e88b08b1f3fc8de8f33b 24-May-2012 Martijn Coenen <maco@google.com> am 1723245e: am acc04ecb: Merge "Fix variable initialization." into jb-dev

* commit '1723245e387454fbcda74cda6d5efeee7e148bda':
Fix variable initialization.
1723245e387454fbcda74cda6d5efeee7e148bda 24-May-2012 Martijn Coenen <maco@google.com> am acc04ecb: Merge "Fix variable initialization." into jb-dev

* commit 'acc04ecbd174b07d580248aaf6640c3d2b42ca49':
Fix variable initialization.
acc04ecbd174b07d580248aaf6640c3d2b42ca49 24-May-2012 Martijn Coenen <maco@google.com> Merge "Fix variable initialization." into jb-dev
a1f935d1a2a21d82a4069d1832e2d7239d7a256f 24-May-2012 Martijn Coenen <maco@google.com> Fix variable initialization.

This could cause Bluetooth file transfers to fail.

Change-Id: I69b91e84cb7df1f147581e37f056eeacd54687d8
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
e971e4e35887f35814306b4f4b8ec0cc27f8e0ff 21-May-2012 The Android Open Source Project <initial-contribution@android.com> am dfec441e: Reconcile with jb-release nakasi-factoryrom-release

* commit 'dfec441ecb64861c4e7683be1e55331cddf6341b':
dfec441ecb64861c4e7683be1e55331cddf6341b 19-May-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-release nakasi-factoryrom-release

Change-Id: If4904e84859a14006a3669574a6ab1e7a87949e7
fe69a664b6a0eed4bfeb3e083101ae6f0134ba31 18-May-2012 The Android Automerger <android-build@android.com> merge in nakasi-factoryrom-release history after reset to jb-dev
0947860faf6b8565735fad5158f343ffe3661057 18-May-2012 Martijn Coenen <maco@google.com> am 6fdfaf58: am 4bfe5662: Merge "Allow bluetooth OPP transfers to be stopped." into jb-dev

* commit '6fdfaf5837acd52f85b2df1b2d90d8d21a32335f':
Allow bluetooth OPP transfers to be stopped.
207928c0d3da016f79bfaafcbf9695f49fe44f6f 18-May-2012 Martijn Coenen <maco@google.com> am 63397ede: am 3cb57672: Merge "Don\'t MediaScan files received through handover." into jb-dev

* commit '63397ede92efd0a31bde340bc301eb3962e3f195':
Don't MediaScan files received through handover.
11386ef22a84d83ced05ca3f1f2685cd1de7ca77 18-May-2012 Martijn Coenen <maco@google.com> am 20e0594a: am 3236357a: Merge "Add BT address and mimeType to handover intents." into jb-dev

* commit '20e0594a8deef6d308c6b61e037aa0a40ce1404f':
Add BT address and mimeType to handover intents.
e3a869d6117800bb5525eb34c47ea3d9a7a0bcbd 17-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
6fdfaf5837acd52f85b2df1b2d90d8d21a32335f 17-May-2012 Martijn Coenen <maco@google.com> am 4bfe5662: Merge "Allow bluetooth OPP transfers to be stopped." into jb-dev

* commit '4bfe5662b7169484d32186a2042cb88cdbc446ba':
Allow bluetooth OPP transfers to be stopped.
63397ede92efd0a31bde340bc301eb3962e3f195 17-May-2012 Martijn Coenen <maco@google.com> am 3cb57672: Merge "Don\'t MediaScan files received through handover." into jb-dev

* commit '3cb57672cefbe78bf89590fb3053b4ab4ecd461b':
Don't MediaScan files received through handover.
20e0594a8deef6d308c6b61e037aa0a40ce1404f 17-May-2012 Martijn Coenen <maco@google.com> am 3236357a: Merge "Add BT address and mimeType to handover intents." into jb-dev

* commit '3236357a784d1bfb6c717115b10a227c98de2a97':
Add BT address and mimeType to handover intents.
4bfe5662b7169484d32186a2042cb88cdbc446ba 17-May-2012 Martijn Coenen <maco@google.com> Merge "Allow bluetooth OPP transfers to be stopped." into jb-dev
3cb57672cefbe78bf89590fb3053b4ab4ecd461b 17-May-2012 Martijn Coenen <maco@google.com> Merge "Don't MediaScan files received through handover." into jb-dev
3236357a784d1bfb6c717115b10a227c98de2a97 17-May-2012 Martijn Coenen <maco@google.com> Merge "Add BT address and mimeType to handover intents." into jb-dev
584dfb2c53b45080347e412b3f7ed7fd1c9b53e7 16-May-2012 Martijn Coenen <maco@google.com> Allow bluetooth OPP transfers to be stopped.

If handover requesters such as NFC want to cancel an
ongoing transfer, they can use this intent. It requires
the same permission that is used for whitelisting,
which at this point is only granted to the NFC service.

Change-Id: I89e27550d700c4a29a892dba99fda740d8845642
ndroidManifest.xml
rc/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java
rc/com/android/bluetooth/opp/Constants.java
ec1ef07632022d1c9f967ca0b0dcd063e3c33d64 16-May-2012 The Android Open Source Project <initial-contribution@android.com> am e91ea9c2: Reconcile with jb-release nakasi-factoryrom-release

* commit 'e91ea9c24580dfbff0c79feccdf5a6081083352f':
e91ea9c24580dfbff0c79feccdf5a6081083352f 16-May-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I5223737e6ad30352b2328d5bf42c347f2fdc5e17
754c21d66208d86f2f0fe973308f5a594eb0196c 16-May-2012 The Android Automerger <android-build@android.com> merge in nakasi-factoryrom-release history after reset to jb-dev
2d81ebcb66e62926074f52cfbf3efc02a2ed54ef 16-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
d92844f2f5b52660fc61299e8b9aaa05b15b47e4 16-May-2012 Eric Fischer <enf@google.com> am 6cd6503d: (-s ours) Import translations. DO NOT MERGE

* commit '6cd6503d5a0388e43a08e456a53905dbefa57e3a':
Import translations. DO NOT MERGE
3a6f95d7195784cd12437ef25b89bd6447d230ba 16-May-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I7d168410259b50cec8509b46a87f7b252cc0044f
es/values-fr/strings.xml
es/values-ru/strings.xml
6cd6503d5a0388e43a08e456a53905dbefa57e3a 16-May-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I66cea0e6b7a5e9377cb77e75ac21914fbbc95de4
es/values-fr/strings.xml
es/values-ru/strings.xml
d5e1472188b7e21123a02339ed8766256aa8f630 15-May-2012 Martijn Coenen <maco@google.com> Don't MediaScan files received through handover.

Handover providers such as NFC may move the file in the filesystem
(out of /bluetooth), hence it's better not to scan them here.

Change-Id: Ic374c5ae880cb65e2d8a9ce615115b51fdc29353
rc/com/android/bluetooth/opp/BluetoothOppService.java
7a4cc5c2f6ec06e8dc6f930680ce9aceff6df359 14-May-2012 Martijn Coenen <maco@google.com> Add BT address and mimeType to handover intents.

Also, allow refreshing whitelisted entries by sending
another whitelist intent.

Change-Id: If85db397e31364939c67b3018413b625a1888ae6
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/Constants.java
7a1cb0a81135e29aeff2bc5a6e666832a83c66e8 05-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
13e522b0bcac2fcc828c31d50b55281614652831 04-May-2012 Eric Fischer <enf@google.com> am 446d4dc5: (-s ours) Import translations. DO NOT MERGE

* commit '446d4dc5053b59a53d9f65a127bb057d7328d858':
Import translations. DO NOT MERGE
ce3b5981455ce3bccf3176318f610ee269a32dc3 04-May-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: Ib59f043d47362a82c7d6ccd4b5a64dcc7ddc26a8
es/values-cs/strings.xml
446d4dc5053b59a53d9f65a127bb057d7328d858 04-May-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I9862cbb427bcb5be81af2e09cc71208c1456be05
es/values-cs/strings.xml
7f6456ae8eb186d32d2ab3ac72023a1ccb888945 03-May-2012 Eric Fischer <enf@google.com> am afd7ca75: (-s ours) Import translations. DO NOT MERGE

* commit 'afd7ca756d2f6d639a99b6d4626989d91ef5125f':
Import translations. DO NOT MERGE
d6d9ba74e56619ac2eff6d24c0d4a2b8b53baa2c 03-May-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I025d3f6555ea2e2e97d38fd24d4f1b3faa321fd6
es/values-nb/strings.xml
es/values-pt-rPT/strings.xml
es/values-zh-rCN/strings.xml
afd7ca756d2f6d639a99b6d4626989d91ef5125f 03-May-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: Ie86c651cb588dec834c629a429ddee49ca51bdd5
es/values-nb/strings.xml
es/values-pt-rPT/strings.xml
es/values-zh-rCN/strings.xml
8de443005956acf4c7e1933d0f576fcbad94fbb9 03-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
b2cb7ea3d3c3305fc69ece576884ed6936362180 02-May-2012 Eric Fischer <enf@google.com> am 7eff23ee: (-s ours) Import translations. DO NOT MERGE

* commit '7eff23eeb2e76d9f434bef7a954ea0d5ade5e28d':
Import translations. DO NOT MERGE
beafd667135dc0b7392aa3182a13215dd7142973 02-May-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: If50e8da1c98d5e0d45e61e5bfbf6e72e1a1a033b
es/values-ar/strings.xml
es/values-de/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
7eff23eeb2e76d9f434bef7a954ea0d5ade5e28d 02-May-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I476bff54ef18b9d35405429e0550d3e7b61971db
es/values-ar/strings.xml
es/values-de/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
d0448bf252949660c396dba883acd0d8f7d05521 02-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
320d404bb39b07a92ddfd37e4349fa29e3e8a823 01-May-2012 Eric Fischer <enf@google.com> am d35635c0: (-s ours) Import translations. DO NOT MERGE

* commit 'd35635c0d53b865b485bd342c1e712b78f0443a7':
Import translations. DO NOT MERGE
2e185820bde67b6db56d2b3829a2a70dac7e73b0 01-May-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: Iddc28b772ef5448d41f35bfe25f74f1158613d83
es/values-es-rUS/strings.xml
es/values-ms/strings.xml
d35635c0d53b865b485bd342c1e712b78f0443a7 01-May-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I886c43f6b61b1d37e9bd92533c6f43c148e46507
es/values-es-rUS/strings.xml
es/values-ms/strings.xml
07c4ca05ff887597b580601780fc68940913be4a 01-May-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
eb1b8f2ba1e5ab486fd7aac5e4caa7fd5c6c8825 30-Apr-2012 Eric Fischer <enf@google.com> am d6d97954: (-s ours) Import translations. DO NOT MERGE

* commit 'd6d97954ca6fc637555732439f63f620b45b3abf':
Import translations. DO NOT MERGE
efc2856ed779aa2a26c0084a4507c20329af52d6 30-Apr-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I209389fb377514c307ef33a2ccc7d8786e07ef0c
es/values-pl/strings.xml
es/values-tl/strings.xml
es/values-zu/strings.xml
d6d97954ca6fc637555732439f63f620b45b3abf 30-Apr-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: Ic54867813d76fe3c63a6d69799972730a61893eb
es/values-pl/strings.xml
es/values-tl/strings.xml
es/values-zu/strings.xml
7fa711eaf8a3bdc46bf63d76f3b7873e50c5a38e 30-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
bf4032e19f2d1801c2166ffac2404e20700633ee 27-Apr-2012 Eric Fischer <enf@google.com> am f1af2b4c: (-s ours) Import translations. DO NOT MERGE

* commit 'f1af2b4c0f154b325e2c3ab875c82ccb5b170aba':
Import translations. DO NOT MERGE
0db7fd3dd1e3788cb529c5333abaca6d3b80971d 27-Apr-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I932b2c45bfe329222791f0e8e7687c1278ea7e64
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-ms/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
f1af2b4c0f154b325e2c3ab875c82ccb5b170aba 27-Apr-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I5e41675842a972f1400a66cdf155e0fa7ba532f2
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-ms/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
f21053bb3737e531bb13ee4aff805314ef29d38b 26-Apr-2012 Eric Fischer <enf@google.com> am acb93ba7: (-s ours) Import translations. DO NOT MERGE

* commit 'acb93ba746b7d7cf1b854f7e1b8223afddb2fa86':
Import translations. DO NOT MERGE
9d404ea313c40f74ad8cd90b7eb787dc65eb6831 26-Apr-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I8561d893a3e913f9cb8abce4f14dd5f62ebf1838
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-lv/strings.xml
es/values-nl/strings.xml
es/values-pt/strings.xml
es/values-sl/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
acb93ba746b7d7cf1b854f7e1b8223afddb2fa86 26-Apr-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: Ia11deef3743e0d63ccbe6f8eb6e311e3f2f11f69
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-lv/strings.xml
es/values-nl/strings.xml
es/values-pt/strings.xml
es/values-sl/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
7f499153ae01846550672818017f78e58f996a85 26-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
d261a4b48548c5a9daf61343976210fdf95bd9d6 25-Apr-2012 Eric Fischer <enf@google.com> Merge "Import translations. DO NOT MERGE"
0b8c389e6a759388ed612be575ec1806397ab31b 25-Apr-2012 Eric Fischer <enf@google.com> am fe4ef10c: (-s ours) Import translations. DO NOT MERGE

* commit 'fe4ef10c3db214a81ec837979f71765b552b8568':
Import translations. DO NOT MERGE
d7104e8276b9c4acc66f54291cd9e7df040d8b01 25-Apr-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: Idf54a67b9ea2d76a1fcf74e4c4fa9a5a0b082728
es/values-ca/strings.xml
es/values-en-rGB/strings.xml
es/values-iw/strings.xml
es/values-nb/strings.xml
es/values-sv/strings.xml
fe4ef10c3db214a81ec837979f71765b552b8568 25-Apr-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: If5a6ab133af77342121ff61d0aea40cc8626f956
es/values-ca/strings.xml
es/values-en-rGB/strings.xml
es/values-iw/strings.xml
es/values-nb/strings.xml
es/values-sv/strings.xml
8c62a9e785f4129581df55fe54ba91e0021e6f80 25-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
b83d52ee2888da517f13cd9fb56f4ed642b9b3e8 24-Apr-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I635726426ba283e8428bfa11abf90da16a824ae1
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
290850af68a479143c15b28dd9824b2a33a555d4 24-Apr-2012 Martijn Coenen <maco@google.com> Merge "Additional changes to support Bluetooth Beam."
8099f5e7bfa7227ba674b5f0076f331e737bafd7 06-Apr-2012 Martijn Coenen <maco@google.com> Additional changes to support Bluetooth Beam.

- Added a whitelist permission, to ensure only system
services (such as NFC) can whitelist MAC addresses.
- Added HANDOVER_STATUS permission, to ensure handover
transfer status can only be received by eligible services
(such as NFC).
- Added new confirmation type HANDOVER_CONFIRMED; this indicates
the transfer was initiated by a handover, and doesn't need to be
confirmed. This type is also reused to send broadcasts
to the NFC service, so the NFC service can show notifications
and deal with the received data.
- Added 15 second timeout to whitelist.
- Modify notication code to not show any notifications for handover
transfers; instead, send broadcasts to indicate handover status.
- Modify "transfer complete" code to sendbroasts to indicate handover
status.
Change-Id: I00c08e09eaf44f0bd4bd837cb6b0c37b802742bc
ndroidManifest.xml
es/values/strings.xml
rc/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
rc/com/android/bluetooth/opp/BluetoothOppProvider.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/opp/BluetoothOppTransferInfo.java
rc/com/android/bluetooth/opp/BluetoothOppUtility.java
rc/com/android/bluetooth/opp/BluetoothShare.java
rc/com/android/bluetooth/opp/Constants.java
658bb24af75eb4bcd876b7990ea56aef440073a5 19-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
8ab91de2a6be340156f4792f5ffd28e4ad5a05a2 18-Apr-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I5cfa785854414256c441ca703ad2480f0434f6d2
es/values-es/strings.xml
7eb987af0aa686b713e278ea6d028bafd85f4c84 16-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
0214467f988d2303b909deb386a7772f93ff30f1 13-Apr-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: Ia88990b571171704ec18c0c7766cb241579b907a
es/values-in/strings.xml
es/values-in/test_strings.xml
067c19eed24696cbd67f1bc51305905257bb3a19 05-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
a4e5a2b1e7fc398285e304caf7019572dce3d16f 05-Apr-2012 Martijn Coenen <maco@google.com> Merge "First cut at Bluetooth Beam."
d6eaf19f39e163e16d22e29907edec402b30622e 04-Apr-2012 Nick Pelly <npelly@google.com> First cut at Bluetooth Beam.

Add Bluetooth address white-listing to avoid receive confirmation from
Beam interactions.

Change-Id: I25720c6e902c494cbb9845a30a175edad4225b89
ndroidManifest.xml
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppProvider.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
b5da4de3eb97ca89d9853a3aaaaca79d2b625a00 03-Apr-2012 Mike Lockwood <lockwood@google.com> Merge remote-tracking branch 'goog/ics-aah'
b9e9076da6bd281577d1f75931aaadafec43eba1 28-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
aeff317dc22a513edae5fc28df043d8927c6c272 27-Mar-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I292e4bd502c2f1569cbdb103529b7c4d6e01a52d
es/values-in/strings.xml
f085c5a5a24c0e7a6a643d95f0f80df76bfa7270 26-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
e273a0c085243d85bf12745858b18d2cee7997fd 23-Mar-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I3ec2408e9e4524df80d0f68d37b5376ae8f9e0f4
es/values-zh-rCN/strings.xml
a67c5234f2962182a42608abfc71664f357751de 21-Mar-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: Ia20e0222899886a1a916fad99056f94083529b26
es/values-da/strings.xml
86994392e5f5fecb3210ee1324be0faec8af3b84 14-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
5341b3ec530b7e693098b1cade147e195674ece3 13-Mar-2012 Daniel Lehmann <lehmannd@google.com> Merge "Use new READ_CALL_LOG permission"
4425b78ac01b81769d23fab6cdf690c5affc45f3 10-Mar-2012 Daniel Lehmann <lehmannd@google.com> Use new READ_CALL_LOG permission

Bug:6141864

Change-Id: I16ce32e960e2b7e4fc104b247849c4013663a90b
ndroidManifest.xml
a60365e6749da22afa11343a6e753f5e95df7413 08-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
818234ac39c15bb48d5b7a38c7f5955b588c50ee 07-Mar-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I44b61aabac36d7c7844ac298aeb68892f5b855ab
es/values-in/strings.xml
7568391796fbb5f30c9f701578a1f82e7aa25097 06-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
3489082f9e71240dcf1f9df20fb34e7408920f88 05-Mar-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I0d770468153cd24147eea856ba5c6ba517866203
es/values-am/strings_pbap.xml
5bd7fa3628fe0ce89897670de435a81cb589b3ac 16-Feb-2012 The Android Open Source Project <initial-contribution@android.com> am db65be88: am fe548d6a: Reconcile with ics-mr1-release

* commit 'db65be882ed3ce70ad8ea311a7f5abc85cc35d84':
c45a497e3ce60651e49f6d056e739fc96d577632 16-Feb-2012 The Android Open Source Project <initial-contribution@android.com> am 1e3fa573: am 2fc1b62a: Reconcile with ics-mr1-release

* commit '1e3fa573f03943afe5794993bdbe4f5c4528db7c':
db65be882ed3ce70ad8ea311a7f5abc85cc35d84 16-Feb-2012 The Android Open Source Project <initial-contribution@android.com> am fe548d6a: Reconcile with ics-mr1-release

* commit 'fe548d6a965bfa990e1f9b291a3e526e52c5ad38':
fe548d6a965bfa990e1f9b291a3e526e52c5ad38 16-Feb-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: Iabe8f7374f8e66b88775543fb58d075f13088cbd
1e3fa573f03943afe5794993bdbe4f5c4528db7c 16-Feb-2012 The Android Open Source Project <initial-contribution@android.com> am 2fc1b62a: Reconcile with ics-mr1-release

* commit '2fc1b62a9cacfc28fc6a8b4b1e42a1aded82ca23':
2fc1b62a9cacfc28fc6a8b4b1e42a1aded82ca23 16-Feb-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: Ie37047344c3707cc7880faa64f1b619044e21ed1
7a79be81b0ba93a0ff1b9744f8e0a3feece8131c 14-Feb-2012 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
f8fe99a1d298015cc968ce019454f079f72f1ecf 10-Feb-2012 Eric Fischer <enf@google.com> am a57e72ea: (-s ours) am 2e68425e: (-s ours) am a167e65c: Import translations. DO NOT MERGE

* commit 'a57e72eaf40ab153ec06c51716d42102de1b311f':
b02496ccd93f12200d2b204c0464e3f19d316982 10-Feb-2012 Eric Fischer <enf@google.com> am f9d3df5a: (-s ours) am 87712d44: am a167e65c: Import translations. DO NOT MERGE

* commit 'f9d3df5a582328d90d2ba7cfd24f603b51c482c6':
Import translations. DO NOT MERGE
a57e72eaf40ab153ec06c51716d42102de1b311f 10-Feb-2012 Eric Fischer <enf@google.com> am 2e68425e: (-s ours) am a167e65c: Import translations. DO NOT MERGE

* commit '2e68425ec2364490dc77b91c8f06b672033e00db':
f9d3df5a582328d90d2ba7cfd24f603b51c482c6 10-Feb-2012 Eric Fischer <enf@google.com> am 87712d44: am a167e65c: Import translations. DO NOT MERGE

* commit '87712d44052e90068f6aa6e021d652b21918e60b':
Import translations. DO NOT MERGE
d761e1c5c609fcc07f17267c6e4baed4cbda4846 10-Feb-2012 Eric Fischer <enf@google.com> am a167e65c: Import translations. DO NOT MERGE

* commit 'a167e65c90e6c58e14b697d14c992447802401b7':
Import translations. DO NOT MERGE
2e68425ec2364490dc77b91c8f06b672033e00db 10-Feb-2012 Eric Fischer <enf@google.com> am a167e65c: Import translations. DO NOT MERGE

* commit 'a167e65c90e6c58e14b697d14c992447802401b7':
Import translations. DO NOT MERGE
87712d44052e90068f6aa6e021d652b21918e60b 10-Feb-2012 Eric Fischer <enf@google.com> am a167e65c: Import translations. DO NOT MERGE

* commit 'a167e65c90e6c58e14b697d14c992447802401b7':
Import translations. DO NOT MERGE
a167e65c90e6c58e14b697d14c992447802401b7 09-Feb-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: If4e20cdabb365ab8a53bf6ad2fcaff4220534908
es/values-es-rUS/strings.xml
es/values-rm/strings.xml
es/values-sw/strings.xml
es/values-zu/test_strings.xml
96ef3fd2145f911e75d0edbf6eb134f4c6d248ee 01-Feb-2012 The Android Open Source Project <initial-contribution@android.com> am 1650476b: am 9a38c83e: Reconcile with ics-mr1-release

* commit '1650476bd8ba41ef3bf630717cf954644bd5c1b0':
1650476bd8ba41ef3bf630717cf954644bd5c1b0 01-Feb-2012 The Android Open Source Project <initial-contribution@android.com> am 9a38c83e: Reconcile with ics-mr1-release

* commit '9a38c83e1757dfb33f4593243267baa938339593':
9a38c83e1757dfb33f4593243267baa938339593 01-Feb-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I9fda103ee8c16f7042b22e0fc6bd09be32f3f194
df719a1e69eaaf7f3e5b1989e4facb1993457aa2 30-Jan-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
4b4ebed3e56947bebe7b077bae31ce8bdb52ea54 26-Jan-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I2103dd0783f7906276899fbeb8d746c003c852f5
es/values-es-rUS/strings.xml
es/values-rm/strings.xml
es/values-sw/strings.xml
e26e4dfd898bc03c8d8f7345477a1236ab077f57 02-Jan-2012 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
eaa1de49ff3a62269d29ed02d7879463f795a292 29-Dec-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I7d31d973487f1ef6906a6c1d1b0f13f7bc4629e9
es/values-zu/test_strings.xml
150e000516d4888799a872c14c37bdaf75b6fcda 09-Dec-2011 The Android Open Source Project <initial-contribution@android.com> am 19417bef: Reconcile with ics-mr1-release

* commit '19417befca4aa6b3d55b6d23103b75ee54ff6e89':
19417befca4aa6b3d55b6d23103b75ee54ff6e89 08-Dec-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I0f886881d60df0aa053f019592baa0dd1ddb9424
fa6dfd2e95091b00b269963eeb9473f2441f2dc2 30-Nov-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: Ifa837ef35780c94b49379c9caa315ae3dc9adb93
4b1c07fcf516c34ccd35bff7fbb299bdcb1bd33e 30-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
87fdba54e2af861b4325b24cc08a2403d7024f5f 30-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
096dcd96ae0b6ba386965e6074531387cda3d265 29-Nov-2011 Chih-Chung Chang <chihchung@google.com> am 0ac98162: Read the requested file size completely.

* commit '0ac98162ff293fdaa23f93f9839aaad5428af537':
Read the requested file size completely.
c22b8377ea2f40d03fbe062cce69ea41f452a48b 29-Nov-2011 Chih-Chung Chang <chihchung@google.com> am 0ac98162: Read the requested file size completely.

* commit '0ac98162ff293fdaa23f93f9839aaad5428af537':
Read the requested file size completely.
0ac98162ff293fdaa23f93f9839aaad5428af537 18-Nov-2011 Chih-Chung Chang <chihchung@google.com> Read the requested file size completely.

This was causing failures while sharing pictures
from Picassa over Bluetooth.

Bug:5632161.

Change-Id: Ieb2697513299270b2982ebc6c9f0b367adf36d3a
rc/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
41f2e49b02364da6cfb65f42730f8cc9914b3ccb 29-Nov-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I726460f3143ba47c96a9105d79a44002c3639c43
es/values-af/strings.xml
es/values-af/test_strings.xml
es/values-sw/strings.xml
es/values-vi/strings.xml
es/values-vi/strings_pbap.xml
es/values-vi/test_strings.xml
es/values-zu/strings.xml
84aeb9c75ec24f616d87933088c62cbceaee139a 28-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
29c7f784cc8cb7004d0da1a8721e7a5a715363ee 22-Nov-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: Ib3cb0799cd54228f43fa27fdf618cbcc0cea18a1
77812a7de9091c0b9f57fd313bd5a28cc32fd864 22-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
ebeb6eaef6bede377e03462a00c0df72971da6a3 22-Nov-2011 Eric Fischer <enf@google.com> am 0e5bc336: (-s ours) Import revised translations. DO NOT MERGE

* commit '0e5bc33617343b0e1cce4fa6300e1fe8103a4292':
Import revised translations. DO NOT MERGE
f350867585d283f11f96c96b83fe0a0d20d5f230 22-Nov-2011 Eric Fischer <enf@google.com> am 0e5bc336: Import revised translations. DO NOT MERGE

* commit '0e5bc33617343b0e1cce4fa6300e1fe8103a4292':
Import revised translations. DO NOT MERGE
0e5bc33617343b0e1cce4fa6300e1fe8103a4292 21-Nov-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I6ad8447cdf1cb726db8711f7288036c7f681da9d
es/values-sw/strings.xml
es/values-vi/strings.xml
es/values-vi/strings_pbap.xml
es/values-vi/test_strings.xml
224f430cc856b0674e6580c33b383129232680d3 19-Nov-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I4f5b3197efd5b4f5b78ed2006276741a23aa501b
988cba962367bb7579a64cb42f7962f9d2145220 17-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
65e33358cd52663e787c93a905e773483947485c 17-Nov-2011 Eric Fischer <enf@google.com> am 4292d313: (-s ours) Import revised translations. DO NOT MERGE

* commit '4292d31334f90c5f7c210eb2ab7b418255ff97a0':
Import revised translations. DO NOT MERGE
146be7184361f1ae9a06d71aad3217d885471ed4 16-Nov-2011 Eric Fischer <enf@google.com> am 4292d313: Import revised translations. DO NOT MERGE

* commit '4292d31334f90c5f7c210eb2ab7b418255ff97a0':
Import revised translations. DO NOT MERGE
4292d31334f90c5f7c210eb2ab7b418255ff97a0 16-Nov-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I36a2d5233771fee938b896a2dfea40a3fc65ccb5
es/values-iw/strings.xml
es/values-vi/strings.xml
es/values-zu/strings.xml
d595693055736e8db35dece4fac71bf8a431863b 16-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
e5f2225a67f6d5a5a33ea4f13f745ef0b0fe174b 15-Nov-2011 Eric Fischer <enf@google.com> am dfea0983: (-s ours) am d4fd0eca: Import revised translations. DO NOT MERGE

* commit 'dfea09839f680aaeee725ac68211ab9b84463664':
Import revised translations. DO NOT MERGE
5a5d474e0c23430ac6fcfce550f6c733de44d753 15-Nov-2011 Eric Fischer <enf@google.com> am dfea0983: am d4fd0eca: Import revised translations. DO NOT MERGE

* commit 'dfea09839f680aaeee725ac68211ab9b84463664':
Import revised translations. DO NOT MERGE
dfea09839f680aaeee725ac68211ab9b84463664 15-Nov-2011 Eric Fischer <enf@google.com> am d4fd0eca: Import revised translations. DO NOT MERGE

* commit 'd4fd0eca9db6939853db49b06c22cf999c31deee':
Import revised translations. DO NOT MERGE
d4fd0eca9db6939853db49b06c22cf999c31deee 14-Nov-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I2507276cf96ca69abc7bda02c8f62085470bfd16
es/values-af/strings.xml
es/values-af/test_strings.xml
es/values-zu/strings.xml
31a52817fae03a24c3bc96390c0a9f1b014004a3 13-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
b1a77ed9d5a44bac8d6ef2dc65781db64af0b429 10-Nov-2011 Eric Fischer <enf@google.com> Merge "Import revised translations."
b454982fb739121faaebbde1dfd153479076babf 10-Nov-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: Ia615a4ec462fae018ae7dc124b7f9eb03c508036
es/values-iw/strings.xml
ee64bb858e98e0f4132b294f253be25598fbdf89 10-Nov-2011 Eric Fischer <enf@google.com> am d24c5574: (-s ours) am 2b5a552a: (-s ours) Import revised translations. DO NOT MERGE

* commit 'd24c5574cb5b23785bd1747414ef7685f63b9022':
Import revised translations. DO NOT MERGE
4eef271e900effc706362c2c2687649a1b53b8f5 10-Nov-2011 Eric Fischer <enf@google.com> am d24c5574: am 2b5a552a: (-s ours) Import revised translations. DO NOT MERGE

* commit 'd24c5574cb5b23785bd1747414ef7685f63b9022':
Import revised translations. DO NOT MERGE
d24c5574cb5b23785bd1747414ef7685f63b9022 10-Nov-2011 Eric Fischer <enf@google.com> am 2b5a552a: (-s ours) Import revised translations. DO NOT MERGE

* commit '2b5a552a15777e350cad3cf7ccaa487b3612b1ca':
Import revised translations. DO NOT MERGE
2b5a552a15777e350cad3cf7ccaa487b3612b1ca 09-Nov-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I3870c3966929b0b37a02e04e1997a8ea412c0243
es/values-iw/strings.xml
1c281b0f3605de971505356b5589b9ed913d1f53 04-Nov-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: Ib0d0203d6720a5fe107788dd717fb574003688be
0328fcaa79fc28748b2f26edcdd3258c85f9b8bd 03-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
b8112a9e72cce6e9fe7db0e6d28783e707b63729 02-Nov-2011 Eric Fischer <enf@google.com> Merge "Import revised translations."
b2537fe20de7a373a7687713d510c3b964383f53 02-Nov-2011 Eric Fischer <enf@google.com> am f5b93a89: Import revised translations.

* commit 'f5b93a895a8d0e57e424c3f8d431bbbeb5aae2cb':
Import revised translations.
37e9e9b6c8090c0c058bec560a2e38b3ebc0e9d9 02-Nov-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: Id7a2b4f41ff5359ed70b11135b508aeef4e7e544
es/values-be/strings.xml
es/values-be/strings_pbap.xml
es/values-be/test_strings.xml
es/values-et/strings.xml
es/values-et/strings_pbap.xml
es/values-et/test_strings.xml
a246ef8b310dd4f7119170ea1be6b9af8aa978d0 02-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
8a8da823e03a9644aafa1e808b089127757f40a0 01-Nov-2011 Eric Fischer <enf@google.com> am f5b93a89: Import revised translations.

* commit 'f5b93a895a8d0e57e424c3f8d431bbbeb5aae2cb':
Import revised translations.
f5b93a895a8d0e57e424c3f8d431bbbeb5aae2cb 01-Nov-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I6dc7478139cc139cb470c3ff3a88803d29a72ded
es/values-be/strings.xml
es/values-be/strings_pbap.xml
es/values-be/test_strings.xml
es/values-et/strings.xml
es/values-et/strings_pbap.xml
es/values-et/test_strings.xml
2ac5eeda009b6ff6c61db0d27e715e38b916dfdc 31-Oct-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I5ed59dac01fe8fe14c6f5be3c5f3a1dacabe5b24
9df223099f323bed495091d4703f61c71d93da0c 31-Oct-2011 Ed Heyl <ed@google.com> Merge remote branch 'goog/ics-mr1' into ics-aah
f350109be1334d8e2dab860975973ed4a2bd56ff 30-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
c6cdfecbb14f8f44b33b9c069449cc7e37039164 30-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
197ec0aa9b3f83db02f5bb17cd4606c5065fe4da 28-Oct-2011 Eric Fischer <enf@google.com> Merge "Import revised translations."
16b2b6fd99136c5f40c0f2de8ba9818da3eb5a23 28-Oct-2011 Ed Heyl <ed@google.com> keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
85762659074dc290c17695381ad64b2862268b28 28-Oct-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I81d6021df5479ecc239b011334a3fd13b1382446
es/values-zh-rCN/strings.xml
es/values-zh-rCN/test_strings.xml
a811b25a65c972e783117a6b4176d88be3440ab3 27-Oct-2011 Eric Fischer <enf@google.com> am 80d32f53: (-s ours) am 90dbb7ad: (-s ours) Import revised translations. DO NOT MERGE

* commit '80d32f533e4e3d46a81c23825ba681123f208766':
Import revised translations. DO NOT MERGE
80d32f533e4e3d46a81c23825ba681123f208766 27-Oct-2011 Eric Fischer <enf@google.com> am 90dbb7ad: (-s ours) Import revised translations. DO NOT MERGE

* commit '90dbb7ad4c2f720d34cf35bdd9f5638a95cc84fa':
Import revised translations. DO NOT MERGE
90dbb7ad4c2f720d34cf35bdd9f5638a95cc84fa 27-Oct-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I63b6b0271dc637e32d688bd40bb8091bb2fbdb04
es/values-zh-rCN/strings.xml
es/values-zh-rCN/test_strings.xml
b833606ef009be04db0536787ef7bd5e7db1e48e 27-Oct-2011 Eric Fischer <enf@google.com> am 52d274ff: (-s ours) Import revised translations. DO NOT MERGE

* commit '52d274ff73f1b1cc780e56a5bdb0ee0bb33617af':
Import revised translations. DO NOT MERGE
ad250dc410158e3c33a15e1d2c60badd10a484f3 27-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
52d274ff73f1b1cc780e56a5bdb0ee0bb33617af 27-Oct-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I0a4ce4ba6dec74820dd9747e5f54afb812af6940
es/values-zh-rCN/strings.xml
es/values-zh-rCN/test_strings.xml
82a512fef858849f2e97c52e1f674f04f163722b 26-Oct-2011 Ed Heyl <ed@google.com> undo reset to ics-mr1 until we have a better method
938e767df6224560149beee5f4320f6428085e6d 26-Oct-2011 Ed Heyl <ed@google.com> reset to ics-mr1, but keep history
d7984a020180801b2eed3b5666e19ddbbc37e049 26-Oct-2011 Eric Fischer <enf@google.com> am daa405c6: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit 'daa405c64e8797030064bafd3fdc07e9f65d229f':
Import revised translations. DO NOT MERGE
daa405c64e8797030064bafd3fdc07e9f65d229f 26-Oct-2011 Eric Fischer <enf@google.com> Merge "Import revised translations. DO NOT MERGE" into ics-mr1
f1e5c827ba23ed8a0453df3815aa7b91d0bfe523 26-Oct-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I213936862cf124b075b7d306f20dfd5acdb85f90
es/values-de/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
565b072113db435dc2e90d881badd46fda766c28 26-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
3386bbc61770564cfd865eeaf356ca62090dfcf0 26-Oct-2011 Ed Heyl <ed@google.com> am 0ad18d26: am 51bfce5b: Merge remote branch \'goog/ics-mr0\' into ics-mr1

* commit '0ad18d26b4e9a5d1734703af45a9dd8ecedcd959':
6195d0d1e6e1af139e1161c0fb95f0f4b1f33f78 26-Oct-2011 Eric Fischer <enf@google.com> am 9a82dd66: (-s ours) am 33f2ee3e: (-s ours) Import revised translations. DO NOT MERGE

* commit '9a82dd6651ea5cb146561ae8c473061286cf6d6f':
Import revised translations. DO NOT MERGE
0ad18d26b4e9a5d1734703af45a9dd8ecedcd959 26-Oct-2011 Ed Heyl <ed@google.com> am 51bfce5b: Merge remote branch \'goog/ics-mr0\' into ics-mr1

* commit '51bfce5b57fc9830c3a7ddbb5959e9274a287724':
9a82dd6651ea5cb146561ae8c473061286cf6d6f 26-Oct-2011 Eric Fischer <enf@google.com> am 33f2ee3e: (-s ours) Import revised translations. DO NOT MERGE

* commit '33f2ee3e41464eb64823311d6763764fc858fd2f':
Import revised translations. DO NOT MERGE
4fd1bf363aa6b08c04326896c0066b1ce6e2c7f4 26-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
51bfce5b57fc9830c3a7ddbb5959e9274a287724 26-Oct-2011 Ed Heyl <ed@google.com> Merge remote branch 'goog/ics-mr0' into ics-mr1
33f2ee3e41464eb64823311d6763764fc858fd2f 25-Oct-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I8aca8fc847ba24ba7b162caffd7cf6fd81baae7f
es/values-ko/strings.xml
es/values-ko/strings_pbap.xml
es/values-ko/test_strings.xml
es/values-zh-rTW/strings.xml
89c47675209d3c5894eb220afd5661822af03263 25-Oct-2011 Eric Fischer <enf@google.com> am 3fcdfc66: Merge "Import revised translations."

* commit '3fcdfc66002e13baef18f7296082c404e98dad6b':
Import revised translations.
3fcdfc66002e13baef18f7296082c404e98dad6b 25-Oct-2011 Eric Fischer <enf@google.com> Merge "Import revised translations."
2ab2729db6a35612b2379500fbee55e214817167 25-Oct-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I53a0035d8860fc3abe0f8152ff57d8cede94d5e4
es/values-de/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ko/strings.xml
es/values-ko/strings_pbap.xml
es/values-ko/test_strings.xml
es/values-lt/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
43f9dc889266f8460f63bb6e67b37eadbcf94aa6 25-Oct-2011 Eric Fischer <enf@google.com> am 4a5dd1d8: (-s ours) am 23055999: (-s ours) Import revised translations. DO NOT MERGE

* commit '4a5dd1d859fba24494f4572783db24fe2d99a9a5':
Import revised translations. DO NOT MERGE
4a5dd1d859fba24494f4572783db24fe2d99a9a5 25-Oct-2011 Eric Fischer <enf@google.com> am 23055999: (-s ours) Import revised translations. DO NOT MERGE

* commit '230559990e8a779424737674f6f42c822131b097':
Import revised translations. DO NOT MERGE
230559990e8a779424737674f6f42c822131b097 25-Oct-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I8aca8fc847ba24ba7b162caffd7cf6fd81baae7f
es/values-ko/strings.xml
es/values-ko/strings_pbap.xml
es/values-ko/test_strings.xml
es/values-zh-rTW/strings.xml
4f070910dba04ee4cda94ef6d2204223994066da 22-Oct-2011 Eric Fischer <enf@google.com> am f80b0362: (-s ours) am d5c72b5b: (-s ours) Import revised translations. DO NOT MERGE

* commit 'f80b03623fc7e9c1abafc0d067eb50d2cc1cc730':
Import revised translations. DO NOT MERGE
f80b03623fc7e9c1abafc0d067eb50d2cc1cc730 22-Oct-2011 Eric Fischer <enf@google.com> am d5c72b5b: (-s ours) Import revised translations. DO NOT MERGE

* commit 'd5c72b5b66964de310960902d35db6196eaffb80':
Import revised translations. DO NOT MERGE
d5c72b5b66964de310960902d35db6196eaffb80 21-Oct-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I5634433c5e917ef272543ac731ac46f89c51fde1
es/values-de/strings.xml
es/values-it/strings.xml
es/values-ru/strings.xml
es/values-zh-rCN/strings.xml
45aec3ad61df50a416f1dc42ef82598765c21adc 21-Oct-2011 Eric Fischer <enf@google.com> am ab55d2a3: (-s ours) am 70f5e06a: (-s ours) Import revised translations. DO NOT MERGE

* commit 'ab55d2a3b79b3d36974cb977f9e62d5da2bd0776':
Import revised translations. DO NOT MERGE
ab55d2a3b79b3d36974cb977f9e62d5da2bd0776 21-Oct-2011 Eric Fischer <enf@google.com> am 70f5e06a: (-s ours) Import revised translations. DO NOT MERGE

* commit '70f5e06a14c779ab82d9d0841ca80072a2fda6c3':
Import revised translations. DO NOT MERGE
70f5e06a14c779ab82d9d0841ca80072a2fda6c3 21-Oct-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I05af02f7255ba06517fd8920859034b71a28ebf9
es/values-zh-rTW/strings.xml
78a8f16c36a425255e2b7ecd0c78ddeb8b79b4b7 20-Oct-2011 Eric Fischer <enf@google.com> am 42d92102: (-s ours) am 1940e6bf: (-s ours) Import revised translations. DO NOT MERGE

* commit '42d921024a06c7418b656d41b40bc0b7ee23dd6e':
Import revised translations. DO NOT MERGE
42d921024a06c7418b656d41b40bc0b7ee23dd6e 20-Oct-2011 Eric Fischer <enf@google.com> am 1940e6bf: (-s ours) Import revised translations. DO NOT MERGE

* commit '1940e6bf4b5d10a781b0952e0a80b9546a3e04c0':
Import revised translations. DO NOT MERGE
1940e6bf4b5d10a781b0952e0a80b9546a3e04c0 20-Oct-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I1ab7e6aaf14abeb8ce1ec6cc06138e1aa94a3aa7
es/values-in/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-sk/strings.xml
58ce1a23c6318c2065b3ea1a9d1103fb350b3c9f 19-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
9aa22b74428ee539d0e0c9e5ac3234af55de1295 19-Oct-2011 Eric Fischer <enf@google.com> am bbd06ced: Merge "Import revised translations."

* commit 'bbd06ced74cc0defbde8c489edea159309f59f55':
Import revised translations.
bbd06ced74cc0defbde8c489edea159309f59f55 19-Oct-2011 Eric Fischer <enf@google.com> Merge "Import revised translations."
08d85ce0ae4c24f6cb675cf6dd7a8a7158910992 19-Oct-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I21d37a0ae2b004f73735febae66224951b239a8e
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hi/strings_pbap.xml
es/values-hi/test_strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
95c9f43fed14ac48b9160c08f8717b20e78c67fa 18-Oct-2011 Eric Fischer <enf@google.com> am 549eb2f5: (-s ours) am d545000b: (-s ours) Import revised translations. DO NOT MERGE

* commit '549eb2f506fd6068b9a7d1062c0d84f9a1c521f8':
Import revised translations. DO NOT MERGE
549eb2f506fd6068b9a7d1062c0d84f9a1c521f8 18-Oct-2011 Eric Fischer <enf@google.com> am d545000b: (-s ours) Import revised translations. DO NOT MERGE

* commit 'd545000b6c55ef714fcf58f0750b5aeda2c258d6':
Import revised translations. DO NOT MERGE
d545000b6c55ef714fcf58f0750b5aeda2c258d6 18-Oct-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: Iba86a399dfee9a3dca06efeb7eece57d031a1077
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hi/strings_pbap.xml
es/values-hi/test_strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
ae033e220ef97c17ea4be1f9ae11f49bffd1d1e1 11-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
35c126781e160a9d24081e97a638023a85f82ee6 10-Oct-2011 Eric Fischer <enf@google.com> am 2b3190df: Import revised translations.

* commit '2b3190df07c8f858f68413ec5ca46fc1f2e8a929':
Import revised translations.
2b3190df07c8f858f68413ec5ca46fc1f2e8a929 08-Oct-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I9011edf1af135cce02182b089a3cc1b0217f90da
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
es/values-zu/test_strings.xml
d9a6eda19481849141dcb7398d6ffa31e869d8c6 05-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
35970d96c2301b72cec8f26c27a8e32e2802ae02 04-Oct-2011 Claudia de Veaux <deveaux@google.com> am f38bfacc: Merge "String cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328"

* commit 'f38bfacc8df350c6152d06a09234d5af459c994f':
String cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328
f38bfacc8df350c6152d06a09234d5af459c994f 04-Oct-2011 Claudia de Veaux <deveaux@google.com> Merge "String cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328"
f7f06d23b83ae233a5ef8608ea2eee0b473366bf 03-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
1244124ab692385a047c26700629592878b6efb9 01-Oct-2011 Eric Fischer <enf@google.com> am 5d2e1d46: Import revised translations.

* commit '5d2e1d467c147156707bbbc779c1c0b705ac47f1':
Import revised translations.
5d2e1d467c147156707bbbc779c1c0b705ac47f1 01-Oct-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I5aaa5b7da3a8a60c786f9e7552478abed965736e
es/values-am/strings.xml
es/values-sw/strings.xml
es/values-sw/strings_pbap.xml
es/values-zu/strings.xml
fb518848a6232c118f4d204327fe4db7629918e0 28-Sep-2011 Claudia de Veaux <deveaux@google.com> String cleanup per standards.
Bugs: 5165745, 5163232, 5162668, 5162667, 5162328

Change-Id: I13759f9946c44e5c62c8b93d9458538cb650a410

Additional string cleanup.
es/values/strings.xml
5adb29ca4fbe9d0058977c0ca1b16400e290a05d 24-Sep-2011 Eric Fischer <enf@google.com> am eba52889: (-s ours) am b294d4d1: (-s ours) Import revised translations. DO NOT MERGE

* commit 'eba528895a1dcd77cdcd7fce59c8f3ffd3def4b4':
Import revised translations. DO NOT MERGE
eba528895a1dcd77cdcd7fce59c8f3ffd3def4b4 24-Sep-2011 Eric Fischer <enf@google.com> am b294d4d1: (-s ours) Import revised translations. DO NOT MERGE

* commit 'b294d4d1f92791a38d1dc77be61af16342df12eb':
Import revised translations. DO NOT MERGE
b294d4d1f92791a38d1dc77be61af16342df12eb 24-Sep-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I32eb5ffdf959eec6091ea74fd1d0bf5546b3ecd2
es/values-am/strings.xml
es/values-sw/strings.xml
es/values-sw/strings_pbap.xml
d7db8cf39bce415b00305f32b1b64fa00b57916c 22-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
64788e85a7ddbc69759bc882d802f53e1cfcd3f2 21-Sep-2011 Daisuke Miyakawa <dmiyakawa@google.com> am 93ee5102: Merge "Only format PAUSE/WAIT character."

* commit '93ee510229f845a26f57630f32af0093869c1baf':
Only format PAUSE/WAIT character.
93ee510229f845a26f57630f32af0093869c1baf 21-Sep-2011 Daisuke Miyakawa <dmiyakawa@google.com> Merge "Only format PAUSE/WAIT character."
119c4f8e0ea3c07af5ba39d4e897c78994639701 21-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
d956b40b2f59599447ae0fa0762e055c0c0ce1a3 19-Sep-2011 Daisuke Miyakawa <dmiyakawa@google.com> Only format PAUSE/WAIT character.

Must be after Iff9461d8c71c5800b0731c3708867003d75bb395

Bug: 5348938
Bug: 4177894
Change-Id: I0c5b5b759d11c9d494f9550b9a7bfe948a0690b6
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
f4ad4d8339cf70c083710e01d2ff69dbe2d6022f 21-Sep-2011 Eric Fischer <enf@google.com> am b8b34a6c: (-s ours) am 07599fc4: (-s ours) Import revised translations. DO NOT MERGE

* commit 'b8b34a6cc793b11a034e9d1a9792fecdf8a2ee96':
Import revised translations. DO NOT MERGE
b8b34a6cc793b11a034e9d1a9792fecdf8a2ee96 21-Sep-2011 Eric Fischer <enf@google.com> am 07599fc4: (-s ours) Import revised translations. DO NOT MERGE

* commit '07599fc4ea3c5b25a3673c65ee8f572296feb873':
Import revised translations. DO NOT MERGE
07599fc4ea3c5b25a3673c65ee8f572296feb873 21-Sep-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: Ic88e71e3b6ce06f22aae9eace0f38523a3e7bac5
es/values-zu/strings.xml
ad45720628f777f54fad1d113f8e2a01ba7ab490 20-Sep-2011 Eric Fischer <enf@google.com> am 22936dbf: Merge "Import revised translations."

* commit '22936dbfd90b895c6a2a8b1341012145bdfe977e':
Import revised translations.
22936dbfd90b895c6a2a8b1341012145bdfe977e 20-Sep-2011 Eric Fischer <enf@google.com> Merge "Import revised translations."
d73f9a809b79f937aef328926c76ab6a1f7d6989 20-Sep-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I2024294abb3c97c19f8dd8532c54451bf38df2d1
es/values-af/strings.xml
es/values-af/strings_pbap.xml
es/values-af/test_strings.xml
es/values-am/strings.xml
es/values-am/strings_pbap.xml
es/values-am/test_strings.xml
es/values-sw/strings.xml
es/values-sw/strings_pbap.xml
es/values-sw/test_strings.xml
es/values-zu/strings.xml
es/values-zu/strings_pbap.xml
es/values-zu/test_strings.xml
fc8d46736bf8c4e15aaa50f881445d955e840bd8 20-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
5940d879700d6360c219a81cf9b1f7cb34bb2a50 20-Sep-2011 Jaikumar Ganesh <jaikumar@google.com> am fcd8b256: Merge "Reject OBEX connection request for OPP with Target."

* commit 'fcd8b256c4ff313791489b4c07dc27a0091b4feb':
Reject OBEX connection request for OPP with Target.
fcd8b256c4ff313791489b4c07dc27a0091b4feb 20-Sep-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "Reject OBEX connection request for OPP with Target."
eb1192b4208d4bf77c92011822e6d171b9f09980 20-Sep-2011 Jaikumar Ganesh <jaikumar@google.com> Reject OBEX connection request for OPP with Target.

According to OPP OBEX specification Sec 5.4, the Push
client should not use target header.

Patch contributed by: inshik.shin@samsung.com

Change-Id: Iaeaa2d488da6592f8bb76a9957ca4b784d032803
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
9478c44002a2cbcdd0007c19eae53095cf48cb46 17-Sep-2011 Eric Fischer <enf@google.com> am 7fcad9ec: (-s ours) am 78cccf96: (-s ours) Import revised translations. DO NOT MERGE

* commit '7fcad9ec9c7179a5f930fcd7819ae0035b5adc8d':
Import revised translations. DO NOT MERGE
7fcad9ec9c7179a5f930fcd7819ae0035b5adc8d 17-Sep-2011 Eric Fischer <enf@google.com> am 78cccf96: (-s ours) Import revised translations. DO NOT MERGE

* commit '78cccf9631d8cb6a316e3d34c1a2884b2d27a97b':
Import revised translations. DO NOT MERGE
78cccf9631d8cb6a316e3d34c1a2884b2d27a97b 17-Sep-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: Icc20b90b58b6ed4d23f47143f5ad33af70d8db5c
es/values-af/strings.xml
es/values-af/strings_pbap.xml
es/values-af/test_strings.xml
es/values-am/strings.xml
es/values-am/strings_pbap.xml
es/values-am/test_strings.xml
es/values-sw/strings.xml
es/values-sw/strings_pbap.xml
es/values-sw/test_strings.xml
es/values-zu/strings.xml
es/values-zu/strings_pbap.xml
es/values-zu/test_strings.xml
4149c96921308dfcc71c810267abe6da462dbac6 13-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
11bea62bb9c4968807a6d54fbab14ed202c6d44e 12-Sep-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I9099de03abf4d6e2d67cfcd6dc455c1be2cd642b
es/values-nb/strings.xml
es/values-ru/strings.xml
21e7242d99574ca41caa39cfb55e3dc1c786725a 08-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
dca6152362544ce9d430ca8f2ece7d5dc0f278d1 08-Sep-2011 Jaikumar Ganesh <jaikumar@google.com> Enforce permissions for Connection dialog intents.

Change-Id: I240985998b0d245aacb051e64b5fdaa335c9c06a
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
2ff419c6314d1721184745a081a1db5ddfca0ce0 07-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
00c1b603753f49fe23e06baeb666675657de9776 06-Sep-2011 Jake Hamby <jhamby@google.com> Merge "Use Notification.Builder.setProgress() for progress notifications."
33805fdc65fac4b11afd1da6d2a1716c7d1c36d9 02-Sep-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: Ie59bbffb6a4bcbee61eca2f7762880aa04e21921
es/values-iw/strings.xml
es/values-nb/strings.xml
dec631a77ab9cc89c4d3867b80cfe300e7cf83e9 02-Sep-2011 Jake Hamby <jhamby@google.com> Use Notification.Builder.setProgress() for progress notifications.

- Convert OPP service to use the new API to create notifications
with a ProgressBar, replacing the previous custom layout.

Bug: 5143664
Change-Id: Iae5e2d417e735588e11c4d17e4172ca40b9dfe73
es/layout/status_bar_ongoing_event_progress_bar.xml
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
10ba57ebefd562dd2e86b115a837d9d000068d9b 30-Aug-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
dc997c2959fd98809f150e173e5293dc16fb48ab 30-Aug-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
b4ea81180ba7478358ea6095c5c8ff1b7813b236 30-Aug-2011 Jaikumar Ganesh <jaikumarg@android.com> am a6f56a6d: (-s ours) am 6060c8c7: Merge "Handle PBAP response packet as raw bytes"

* commit 'a6f56a6dd21099169a52ecc7717ad8e9236e5c83':
Handle PBAP response packet as raw bytes
a6f56a6dd21099169a52ecc7717ad8e9236e5c83 30-Aug-2011 Jaikumar Ganesh <jaikumarg@android.com> am 6060c8c7: Merge "Handle PBAP response packet as raw bytes"

* commit '6060c8c7e2dcfe1bffd74e4aff04655a23da49bd':
Handle PBAP response packet as raw bytes
6060c8c7e2dcfe1bffd74e4aff04655a23da49bd 29-Aug-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "Handle PBAP response packet as raw bytes"
c51609d8d2f060d60afd8b5a68d4905d1fc83f02 29-Aug-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "Handle PBAP response packet as raw bytes"
ce8d51a3a43d113a4a6bad30d595c2a81d0f623c 21-Mar-2011 Yoshiharu Kurita <yoshiharu.x.kurita@sonyericsson.com> Handle PBAP response packet as raw bytes

Adjust PBAP response packet to be always handled as bytes.
Currently, it is handled as string when is read from internal data.
This causes the lack of PullvCardListing packet and the abort of
PullPhonebook transaction when multi-byte characters are contained
into corresponding contacts.
This fix will avoid the lack and the abort by writing whole packet
into the target stream as byte.

Change-Id: I17ee3ada25718cc263c9e0942f75605bd971b638
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
6f213000e591d8f548942381d825d7a543ffcc91 26-Aug-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: Ia4ec14de1e226cffb8f4604cf9f691806c2eea2f
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
daa33838c0b8f78b45b370523a11710e56e9a84e 23-Aug-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "Fix SendConnection state params."
cab07635ea60924a4e9dc13f87a4408988ad4c57 23-Aug-2011 Jaikumar Ganesh <jaikumar@google.com> Fix SendConnection state params.

Reported by: sj222.choi@samsung.com

Change-Id: I67da4f8a19be72092aa6cd139e561f4e9dfc5f8f
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
c93e905191e27e2aa87efb43fcb3accf7f6a7714 23-Aug-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "Update sendConnectionState change function paramter."
72d2952fcde46d8c2adc68718957c2fe9f5fa3b0 22-Aug-2011 Jaikumar Ganesh <jaikumar@google.com> Update sendConnectionState change function paramter.

Change-Id: Iaf7e43d35ab4a5da325ebae77cbb72617705c772
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
27e635b4db595644e6d41668f87df68e6c89e11c 22-Aug-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I3e5f9f4a9cf63e2f2a86b7c050f8fb765241f618
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-iw/strings_pbap.xml
es/values-iw/test_strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
6136c134a01b36f7e8a4450170f18104a74c8e7c 17-Aug-2011 Claudia de Veaux <deveaux@google.com> Merge "Part of effort to remove "failure" messaging to end-users. Bug: 5165745"
804e35b02b1ae99590f7de539199ba1c5f8b74b2 17-Aug-2011 Jaikumar Ganesh <jaikumarg@android.com> am e35568a2: am 90e61845: Merge "Send local time, not GMT, in timestamp."

* commit 'e35568a2c3a74c5609216e4b80f9a0872bb200c7':
Send local time, not GMT, in timestamp.
e35568a2c3a74c5609216e4b80f9a0872bb200c7 17-Aug-2011 Jaikumar Ganesh <jaikumarg@android.com> am 90e61845: Merge "Send local time, not GMT, in timestamp."

* commit '90e6184588edb1b43a41f2b73f00f65831a737f6':
Send local time, not GMT, in timestamp.
90e6184588edb1b43a41f2b73f00f65831a737f6 17-Aug-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "Send local time, not GMT, in timestamp."
453a8e5633b1bb7dc01154fb50dfd71f43284507 17-Aug-2011 Claudia de Veaux <deveaux@google.com> Part of effort to remove "failure" messaging to end-users.
Bug: 5165745

Change-Id: Iffe0f7ce288c2bdb379d2a356f2c5ce346e13b43
es/values/strings.xml
1f18480dfa9ea5557bcd5928a4c152ab40b85c7e 15-Jun-2011 HÃ¥kan3 Johansson <hakan3.johansson@sonyericsson.com> Send local time, not GMT, in timestamp.

The missed, incoming and outgoing call list shall always have its
time specified in local time according to PBAP V10r00 chapter
"3.1.4.1 Call History extension".

Change-Id: If0c4733552db3813d636a2f4658e64df1c6a4efe
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
11f19c920d5d78679e35a97d079264884532ed60 15-Jun-2011 HÃ¥kan3 Johansson <hakan3.johansson@sonyericsson.com> Send local time, not GMT, in timestamp.

The missed, incoming and outgoing call list shall always have its
time specified in local time according to PBAP V10r00 chapter
"3.1.4.1 Call History extension".

Change-Id: If0c4733552db3813d636a2f4658e64df1c6a4efe
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
ff53e47604c9cb24aeac196560ec0e1ae8ac1530 15-Jul-2011 jhtop.kim <jhtop.kim@samsung.com> Bluetooth : fix UI bug while an opp object tranfer is ongoing

- While an opp object is transferring ,there is a white border line on the left side of the progress-bar
,which is shown when user click down the notification bar.
- remove the background flag

Change-Id: I4786af460cdd50a9b853f4fa16a12214f4390952
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
es/layout/status_bar_ongoing_event_progress_bar.xml
ef697b0b9a74e15b5003e134307e72b20b48de12 02-Aug-2011 jhtop.kim <jhtop.kim@samsung.com> Bluetooth : fix for the OPP service bug while BT on/off

Update patch set for removing BOOT_COMPLETED.

BluetoothOppService.java : use sendMSG instead of sendMSGdelayed
BluetoothOppReceiver.java : delete boot-complete line
AndroidManifest : delete boot-complete line

Change-Id: Icf9a2f48a70ba519cb3caf93a0b33e13472d1f54
Author: jhtop.kim <jhtop.kim@samsung.com>
ndroidManifest.xml
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
66cbd62c4837f1e9a261fb1bde1d470c904f2346 04-Aug-2011 jhtop.kim <jhtop.kim@samsung.com> Bluetooth :fix opp for socket error retry

When the pin or link key missing case occurs,
we need to retry the socket connection. Use a timeout
of 1.5 secs instead of 2.5 secs because the ACL inactivity
timer is 2 secs.

Change-Id: I3d4c096bd823e3204e91040bea608e44471dd4ce
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
6861c09108700815891920147247f2cf48261ee4 02-Aug-2011 Jaikumar Ganesh <jaikumar@google.com> Check if BT is already enabled before starting activity.

If BT is off, and if the user sends a file, BT will be turned on
and the "Enabling dialog" wil be shown. But with the hot feature,
BT turns on very fast which leads to the intent being missed and the
enabling dialog not being dismissed.

Change-Id: I4f4a6f08e04922a61eb7138b76383a77f8d37da4
rc/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java
77e6229d558b52c316fdba8dd29a6b26fb13fd28 30-Jul-2011 jhtop.kim <jhtop.kim@samsung.com> Bluetooth : fix for pbap ANR while BT on/off

Don't wait to start the listener.

Change-Id: I257332bc38a25b3ca772267a974b4280a8074c40
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
ed1b9e9cb599a9a4a2580521b83dfeef464e31f4 27-Jul-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "Fix notification issues with OPP."
b0b662a98d8b7c099ee706d0e08bd239adcdffc7 27-Jul-2011 Jaikumar Ganesh <jaikumar@google.com> Fix notification issues with OPP.

Since its a notification event for an ongoing event, add the flag.
That prevents it from being scrollable.

Change-Id: Iaea2e7005cb4f8ab5d0b594c4ef9b30343b730fc
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
c6f021b9ef755b949cc736e8665a1a1abe4fb4dd 26-Jul-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: Idd95427fb64014e47b6868043abece64b0183fe8
es/values-zu/strings.xml
es/values-zu/strings_pbap.xml
b4497ead8a3462a4c594013918c42253a39f380c 16-Jul-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I0837f9e863ed402ef8240f9caeba78be9f9e0f1d
es/values-af/strings_pbap.xml
es/values-am/strings_pbap.xml
es/values-ar/strings_pbap.xml
es/values-bg/strings_pbap.xml
es/values-ca/strings_pbap.xml
es/values-cs/strings_pbap.xml
es/values-da/strings_pbap.xml
es/values-de/strings_pbap.xml
es/values-el/strings_pbap.xml
es/values-en-rGB/strings_pbap.xml
es/values-es-rUS/strings_pbap.xml
es/values-es/strings_pbap.xml
es/values-fa/strings_pbap.xml
es/values-fi/strings_pbap.xml
es/values-fr/strings_pbap.xml
es/values-hr/strings_pbap.xml
es/values-hu/strings_pbap.xml
es/values-in/strings_pbap.xml
es/values-it/strings_pbap.xml
es/values-iw/strings_pbap.xml
es/values-ja/strings_pbap.xml
es/values-ko/strings_pbap.xml
es/values-lt/strings_pbap.xml
es/values-lv/strings_pbap.xml
es/values-ms/strings_pbap.xml
es/values-nb/strings_pbap.xml
es/values-nl/strings_pbap.xml
es/values-pl/strings_pbap.xml
es/values-pt-rPT/strings_pbap.xml
es/values-pt/strings_pbap.xml
es/values-rm/strings_pbap.xml
es/values-ro/strings_pbap.xml
es/values-ru/strings_pbap.xml
es/values-sk/strings_pbap.xml
es/values-sl/strings_pbap.xml
es/values-sr/strings_pbap.xml
es/values-sv/strings_pbap.xml
es/values-sw/strings_pbap.xml
es/values-th/strings_pbap.xml
es/values-tl/strings_pbap.xml
es/values-tr/strings_pbap.xml
es/values-uk/strings_pbap.xml
es/values-vi/strings_pbap.xml
es/values-zh-rCN/strings_pbap.xml
es/values-zh-rTW/strings_pbap.xml
es/values-zu/strings_pbap.xml
d5b8cc2a826b068f7e159d91a421c2335566de95 08-Jul-2011 Eric Fischer <enf@google.com> Merge "Import revised translations."
aa965f3d29467e86a2a3f625f3f89a0ddaad82af 08-Jul-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I5d5dde2e0a877ad06cdbfedc50be04117024290d
es/values-vi/strings.xml
7eab97d6be9228b1c210bbb171c3e5e88e02f3d8 28-Jun-2011 Matthew Xie <mattx@google.com> Move Pbap permission dialog to Settings app.

Strings and diglog are removed and will reappear and modified in Settings
app. We want phone AT commander to use the dialog too.
bug 4489572

Change-Id: I0283b5deff974e53384dc5a92bd01c02e12bbcd6
ndroidManifest.xml
es/layout/access.xml
es/values/strings_pbap.xml
rc/com/android/bluetooth/pbap/BluetoothPbapActivity.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
1e8134d9d0cfd246b1e0910aeb1618adea84505f 23-Jun-2011 Conley Owens <cco3@android.com> am 13d55be4: am 4f97a7a9: (-s ours) Merge "pullVcard of unknown phone number"

* commit '13d55be4e4cb84084e45d573604bff6b48f2105c':
pullVcard of unknown phone number
13d55be4e4cb84084e45d573604bff6b48f2105c 23-Jun-2011 Conley Owens <cco3@android.com> am 4f97a7a9: (-s ours) Merge "pullVcard of unknown phone number"

* commit '4f97a7a93ae52589b63fd15d2596549b5a084ca8':
pullVcard of unknown phone number
4f97a7a93ae52589b63fd15d2596549b5a084ca8 22-Jun-2011 Conley Owens <cco3@android.com> Merge "pullVcard of unknown phone number"
bf287751bfa6795493b80b0f22854f747f6f974a 22-Jun-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "pullVcard of unknown phone number"
d54a9ac9fd18e2f1df30774a0b6902b91752ea66 22-Jun-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "Revert "pullVcard of unknown phone number""
77ba5f6684f4dd7e4b7fc37982271da5654aec07 21-Dec-2010 Staffan Lindvall <staffan.lindvall.x@sonyericsson.com> pullVcard of unknown phone number

When performing a pullVcardListing, pullVcardEntry or pullPhonebook
on a phone with a call list which contains an unknown phone number,
the phone returns "-1" as number/name. Corresponding errors exist
for private and payphone numbers, where the phone returns the name
"-2" and "-3", respectively. During pullVcardListing the Name
attribute may contain the phone number, in case the name is not
known. The latter is already implemented today, however, instead of
using e.g. "-1" as name when the phone number is not known the
phone should use Name = "Unknown". Currently there are no other
matching corresponding strings defined for private and payphone
number, which means that for now "Unknown" may be returned as name
also for these numbers.
During pullVcardEntry and during pullPhonebook when the phone number
is unknown then the Number attribute should contain the string
"Unknown". During the same scenario the FN and N attributes both
should contain the string "" when the name is not known. When it
comes to private and payphone numbers the same as for
pullVcardListing apply here, i.e. "Unknown" may be used in the
Number attribute also for these numbers

Change-Id: Icf06e527032588f075ff848bea1ba90bf71e874f
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
2f429e31a13f81c9248173b144efca32c0070045 22-Jun-2011 Jaikumar Ganesh <jaikumar@google.com> Revert "pullVcard of unknown phone number"

This reverts commit 86d30be8aa68d0a2b561c36b53f4e5ebe586fe72.
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
01b4ceaeeb62c1b98f43cc39833a05fc1b4de643 20-Jun-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I99ef1ccfc8082e7b1c90992424d74d8caeef5990
es/values-af/strings.xml
es/values-af/strings_pbap.xml
es/values-am/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-ms/strings.xml
es/values-ms/strings_pbap.xml
es/values-ms/test_strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
6924f63709db415423cb931ebe64bac38b713d40 16-Jun-2011 Eric Fischer <enf@google.com> am a83320e3: (-s ours) am 390a9bf1: Import revised translations. DO NOT MERGE

* commit 'a83320e34013f324405653eb2016a25536b0e3e1':
Import revised translations. DO NOT MERGE
44c347ad717ca51b00819736227f7a9c81905396 15-Jun-2011 Liejun Tao <L.J.Tao@motorola.com> Modify the Rfcomm retry logic

In BluetoothOppTransfer where we check mRetry and e.getMessage()
if mRetry is false and e is not "Invalid exchange", the transfer is stuck

Change-Id: Ie7a4da215c9e74e167db9fa29c6e113a7a7a2c77
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
a83320e34013f324405653eb2016a25536b0e3e1 16-Jun-2011 Eric Fischer <enf@google.com> am 390a9bf1: Import revised translations. DO NOT MERGE

* commit '390a9bf15ffe2239b391dff3c7b20b8476e46bdd':
Import revised translations. DO NOT MERGE
390a9bf15ffe2239b391dff3c7b20b8476e46bdd 16-Jun-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I6cf68cff7a9117c09f70cec068bfe119d9c1072b
es/values-da/strings.xml
d318d6a134efc5bd43653c463699802381f2e0cb 08-Jun-2011 Jaikumar Ganesh <jaikumarg@android.com> am 9d67ffda: am c50dbb00: Merge "OPP: Notification position is changing"

* commit '9d67ffdac68b49cfc72491f7e2c340df922dbcca':
OPP: Notification position is changing
81512ba08c038366688fbe918373f7a9d3e31c9a 08-Jun-2011 Jaikumar Ganesh <jaikumarg@android.com> am 6874774a: am e7df5087: Merge "Handle OBEX Abort packets sent from remote device"

* commit '6874774ab6b2fe5d90896be756d26a9887e4124b':
Handle OBEX Abort packets sent from remote device
9d67ffdac68b49cfc72491f7e2c340df922dbcca 07-Jun-2011 Jaikumar Ganesh <jaikumarg@android.com> am c50dbb00: Merge "OPP: Notification position is changing"

* commit 'c50dbb0067de1772ced124f5982a59468ad81426':
OPP: Notification position is changing
6874774ab6b2fe5d90896be756d26a9887e4124b 07-Jun-2011 Jaikumar Ganesh <jaikumarg@android.com> am e7df5087: Merge "Handle OBEX Abort packets sent from remote device"

* commit 'e7df508750728dc2bbd7729d54673bf16f7688c3':
Handle OBEX Abort packets sent from remote device
0fdf5a12a689c29c9c108c1284e0a8551f2997e3 21-Dec-2010 Staffan Lindvall <staffan.lindvall.x@sonyericsson.com> pullVcard of unknown phone number

When performing a pullVcardListing, pullVcardEntry or pullPhonebook
on a phone with a call list which contains an unknown phone number,
the phone returns "-1" as number/name. Corresponding errors exist
for private and payphone numbers, where the phone returns the name
"-2" and "-3", respectively. During pullVcardListing the Name
attribute may contain the phone number, in case the name is not
known. The latter is already implemented today, however, instead of
using e.g. "-1" as name when the phone number is not known the
phone should use Name = "Unknown". Currently there are no other
matching corresponding strings defined for private and payphone
number, which means that for now "Unknown" may be returned as name
also for these numbers.
During pullVcardEntry and during pullPhonebook when the phone number
is unknown then the Number attribute should contain the string
"Unknown". During the same scenario the FN and N attributes both
should contain the string "" when the name is not known. When it
comes to private and payphone numbers the same as for
pullVcardListing apply here, i.e. "Unknown" may be used in the
Number attribute also for these numbers

Change-Id: I33cf6ceecf5c8fba426eacbb3a507228f8e4de4d
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
c96189602abe4cb3ca2ee97fa6fdc383a05930ba 06-Jun-2011 Jaikumar Ganesh <jaikumarg@android.com> am 29cedf41: am a2407587: Merge "Require bonding and encryption for PBAP server"

* commit '29cedf4183144e450c226dec6668ff0d633cee93':
Require bonding and encryption for PBAP server
29cedf4183144e450c226dec6668ff0d633cee93 06-Jun-2011 Jaikumar Ganesh <jaikumarg@android.com> am a2407587: Merge "Require bonding and encryption for PBAP server"

* commit 'a2407587440d487aa0171638eef29526515fde59':
Require bonding and encryption for PBAP server
c50dbb0067de1772ced124f5982a59468ad81426 01-Jun-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "OPP: Notification position is changing"
e7df508750728dc2bbd7729d54673bf16f7688c3 01-Jun-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "Handle OBEX Abort packets sent from remote device"
9abe9c9e1ccad600b1069490293d78dfd984017b 22-Feb-2011 Andreas Areskoug <andreas.areskoug@stericsson.com> Handle OBEX Abort packets sent from remote device

This patch adds support for handling OBEX Abort packets
sent from remote device, where the remote device is acting
as a client, sending files to the server.

Depends-On: I0fc2255c463c5ce1e8fa1d7febf144b60965a1be

Change-Id: I4bce05a9007ba02e9d9987ec3cbbf1db380247f0
Signed-off-by: christian bejram <christian.bejram@stericsson.com>
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
e2a45a9ee32d5dc155b4aa03897d2d6287ccc441 01-Jun-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "pullVcard of unknown phone number"
86d30be8aa68d0a2b561c36b53f4e5ebe586fe72 21-Dec-2010 Staffan Lindvall <staffan.lindvall.x@sonyericsson.com> pullVcard of unknown phone number

When performing a pullVcardListing, pullVcardEntry or pullPhonebook
on a phone with a call list which contains an unknown phone number,
the phone returns "-1" as number/name. Corresponding errors exist
for private and payphone numbers, where the phone returns the name
"-2" and "-3", respectively. During pullVcardListing the Name
attribute may contain the phone number, in case the name is not
known. The latter is already implemented today, however, instead of
using e.g. "-1" as name when the phone number is not known the
phone should use Name = "Unknown". Currently there are no other
matching corresponding strings defined for private and payphone
number, which means that for now "Unknown" may be returned as name
also for these numbers.
During pullVcardEntry and during pullPhonebook when the phone number
is unknown then the Number attribute should contain the string
"Unknown". During the same scenario the FN and N attributes both
should contain the string "" when the name is not known. When it
comes to private and payphone numbers the same as for
pullVcardListing apply here, i.e. "Unknown" may be used in the
Number attribute also for these numbers

Change-Id: I33cf6ceecf5c8fba426eacbb3a507228f8e4de4d
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
74e5eba4a45ecca87eec3ac1762ca527cc614d78 12-Apr-2011 erik.ljungberg <erik.ljungberg@sonyericsson.com> OPP: Notification position is changing

If several transfers is ongoing the Bluetooth transfer notification
is changing position. The reason for this is that the when field is
not set in the notification. Solved by setting when.

Change-Id: If999fae6dd2d6b5de38c3bfeba786ad2df9da48f
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
af29ee860af8f14cd0ecf19702b6f1eead842491 27-May-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I13bdd6fc76e46a3fee0c3cf85fc512cfb846a230
es/values-am/strings.xml
es/values-am/strings_pbap.xml
es/values-am/test_strings.xml
es/values-sw/strings.xml
es/values-sw/strings_pbap.xml
es/values-sw/test_strings.xml
es/values-zu/strings.xml
es/values-zu/strings_pbap.xml
es/values-zu/test_strings.xml
146d1d10ebf6ed21b00a3f48ad401b801ec1e12e 21-Mar-2011 Yoshiharu Kurita <yoshiharu.x.kurita@sonyericsson.com> Handle PBAP response packet as raw bytes

Adjust PBAP response packet to be always handled as bytes.
Currently, it is handled as string when is read from internal data.
This causes the lack of PullvCardListing packet and the abort of
PullPhonebook transaction when multi-byte characters are contained
into corresponding contacts.
This fix will avoid the lack and the abort by writing whole packet
into the target stream as byte.

Change-Id: I17ee3ada25718cc263c9e0942f75605bd971b638
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
a2407587440d487aa0171638eef29526515fde59 26-May-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "Require bonding and encryption for PBAP server"
4672c98499234667141ddd7ffcdd7db6acc45fd3 22-May-2011 Jaikumar Ganesh <jaikumarg@android.com> am b5f6bb1a: am d8a9af40: Merge "BT: Fix for vCard Listing error"

* commit 'b5f6bb1afba8d322d7453cb6a24751599897234a':
BT: Fix for vCard Listing error
b5f6bb1afba8d322d7453cb6a24751599897234a 21-May-2011 Jaikumar Ganesh <jaikumarg@android.com> am d8a9af40: Merge "BT: Fix for vCard Listing error"

* commit 'd8a9af404413ad060eb4aa29a32370b44e61327e':
BT: Fix for vCard Listing error
d8a9af404413ad060eb4aa29a32370b44e61327e 20-May-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "BT: Fix for vCard Listing error"
14839b17c8d98b60821786a167f1c7ba9f9693fe 11-May-2011 Eric Fischer <enf@google.com> am cf8010da: (-s ours) am 7aa5a581: am 88fd05d3: (-s ours) Import revised translations. DO NOT MERGE

* commit 'cf8010da3314fd03793ce1efa6e9fe495dda9824':
Import revised translations. DO NOT MERGE
34f2c7dab0fa8a2c734cc2d79bff73d445dc5c50 11-May-2011 Eric Fischer <enf@google.com> am f176b01f: (-s ours) am d7b9a76a: Import revised translations. DO NOT MERGE

* commit 'f176b01f0d543b3eff8ccbfea5c644494d5011eb':
Import revised translations. DO NOT MERGE
cf8010da3314fd03793ce1efa6e9fe495dda9824 10-May-2011 Eric Fischer <enf@google.com> am 7aa5a581: am 88fd05d3: (-s ours) Import revised translations. DO NOT MERGE

* commit '7aa5a581f0d6631a9af5cac4f27da5479b8bc4e1':
Import revised translations. DO NOT MERGE
7aa5a581f0d6631a9af5cac4f27da5479b8bc4e1 10-May-2011 Eric Fischer <enf@google.com> am 88fd05d3: (-s ours) Import revised translations. DO NOT MERGE

* commit '88fd05d3dd5eedcd37da293f97a43c3eb31feb19':
Import revised translations. DO NOT MERGE
f176b01f0d543b3eff8ccbfea5c644494d5011eb 10-May-2011 Eric Fischer <enf@google.com> am d7b9a76a: Import revised translations. DO NOT MERGE

* commit 'd7b9a76a5ce4dcc7203fa8765b657ce13e12b2a2':
Import revised translations. DO NOT MERGE
d7b9a76a5ce4dcc7203fa8765b657ce13e12b2a2 10-May-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: Iac56f615976d5b29b29a3278482939d0ea53f5fe
es/values-ru/strings.xml
73adcc0f5b6051ef514a3f16a2e28eabee2b367e 02-May-2011 Conley Owens <cco3@android.com> Merge commit 'a2f16c01' into m

Conflicts:
src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java

Change-Id: Ib3533b9713373c84636940dbe3e41203898aef46
a2f16c010b59d3bc9ff978b178ded62c1e2b9d8f 30-Apr-2011 Conley Owens <cco3@android.com> am 4da2545c: am f6dace4a: Merge "Bluetooth: Add vCard version support for call history."

* commit '4da2545c8543c7ba4729f63c86a38008309ec870':
Bluetooth: Add vCard version support for call history.
88fd05d3dd5eedcd37da293f97a43c3eb31feb19 29-Apr-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I89cc42e5b6283f8c632b23c40596bc1a4bb3413c
es/values-ru/strings.xml
4da2545c8543c7ba4729f63c86a38008309ec870 29-Apr-2011 Conley Owens <cco3@android.com> am f6dace4a: Merge "Bluetooth: Add vCard version support for call history."

* commit 'f6dace4a1ed909d9a5f87781a7c4e02cc06fc021':
Bluetooth: Add vCard version support for call history.
f6dace4a1ed909d9a5f87781a7c4e02cc06fc021 29-Apr-2011 Conley Owens <cco3@android.com> Merge "Bluetooth: Add vCard version support for call history."
7bd72d80443b8ee0d8af2664cc726ccd02771996 28-Apr-2011 Eric Fischer <enf@google.com> am bec2294c: (-s ours) am 189e3bec: (-s ours) am 6d48feaa: Import revised translations. DO NOT MERGE

* commit 'bec2294c44c650bef5a08da63922795aa1194fd4':
Import revised translations. DO NOT MERGE
bec2294c44c650bef5a08da63922795aa1194fd4 28-Apr-2011 Eric Fischer <enf@google.com> am 189e3bec: (-s ours) am 6d48feaa: Import revised translations. DO NOT MERGE

* commit '189e3becc9b494f25a11484a842ea150be116a42':
Import revised translations. DO NOT MERGE
174a747944b553c654d149140d034612924d3ece 05-Apr-2011 Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com> BT: Fix for vCard Listing error

This patch fixes listing of the incomplete vCard xml file, which
contains special characters which are larger than one byte.

Change-Id: Ice5a056004aa30255a06f8742428d4bcfa5813c8
Signed-off-by: christian bejram <christian.bejram@stericsson.com>
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
189e3becc9b494f25a11484a842ea150be116a42 28-Apr-2011 Eric Fischer <enf@google.com> am 6d48feaa: Import revised translations. DO NOT MERGE

* commit '6d48feaaff63b14adc23e7b2d82854189a456f15':
Import revised translations. DO NOT MERGE
6d48feaaff63b14adc23e7b2d82854189a456f15 27-Apr-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I514527d78b0fc0ace90060441a3622c47d662df2
es/values-ko/strings.xml
es/values-ru/strings.xml
es/values-zh-rTW/strings_pbap.xml
91fec75311a589cb56260c1c724217e2987055b2 26-Apr-2011 Jaikumar Ganesh <jaikumarg@android.com> am 2db76af8: am a96efa27: am 16fc087d: Merge "Fixing crash in BluetoothPbapService."

* commit '2db76af8fa625692430dfc1a21910be2eaa92581':
Fixing crash in BluetoothPbapService.
2db76af8fa625692430dfc1a21910be2eaa92581 26-Apr-2011 Jaikumar Ganesh <jaikumarg@android.com> am a96efa27: am 16fc087d: Merge "Fixing crash in BluetoothPbapService."

* commit 'a96efa270cf215602b0ab1f3603c24aadff808da':
Fixing crash in BluetoothPbapService.
a96efa270cf215602b0ab1f3603c24aadff808da 26-Apr-2011 Jaikumar Ganesh <jaikumarg@android.com> am 16fc087d: Merge "Fixing crash in BluetoothPbapService."

* commit '16fc087dc9dea43c436b0f98995ba0afb75119fb':
Fixing crash in BluetoothPbapService.
16fc087dc9dea43c436b0f98995ba0afb75119fb 26-Apr-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "Fixing crash in BluetoothPbapService."
7d6a3299b58c5b53de4016a2e199974b94ae90df 26-Apr-2011 Mathias Jeppsson <mathias.jeppsson@sonyericsson.com> Fixing crash in BluetoothPbapService.

If Bluetooth is turned off while there is an PBAP connect request
pending, the status bar notification or yes/no activity will not
disappear. If user selects yes, an intent will start PbapService
again. PbapService will try to make the device trusted. As this
instance of PbapService don't have any connected device, crash will
occur.

Make sure status bar notification or yes/no activity disappears, by
sending timeout intent when Bluetooth is turned off.
Also, PbapReceiver should not forward any intents except STATE_ON
if Bluetooth is off as this will start the PbapService.

Change-Id: Iee4f95ab2de34db6e00ff9b1fd7f8677947b8f4f
rc/com/android/bluetooth/pbap/BluetoothPbapReceiver.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
b6a11f97addec9f7a9fbc51a2fedd567b3d0a276 18-Apr-2011 Eric Fischer <enf@google.com> am 2f4272cb: (-s ours) am d9945336: am 624517c2: (-s ours) Import revised translations. DO NOT MERGE

* commit '2f4272cb56a5470d1a0c199ae8c2a0babba9cc2f':
Import revised translations. DO NOT MERGE
2f4272cb56a5470d1a0c199ae8c2a0babba9cc2f 18-Apr-2011 Eric Fischer <enf@google.com> am d9945336: am 624517c2: (-s ours) Import revised translations. DO NOT MERGE

* commit 'd994533643ae793ef983155b3ede633d219d1237':
Import revised translations. DO NOT MERGE
90dd95e2da951ab6a2a3e71292c42ef089473c3f 15-Apr-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: Ice85424513fb237d9287851d47cdad0ecfd1b750
es/values-ru/strings.xml
d994533643ae793ef983155b3ede633d219d1237 15-Apr-2011 Eric Fischer <enf@google.com> am 624517c2: (-s ours) Import revised translations. DO NOT MERGE

* commit '624517c2bba1aa85d026072510943cb9567ca164':
Import revised translations. DO NOT MERGE
624517c2bba1aa85d026072510943cb9567ca164 14-Apr-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I9e79fc9d62787d9d79d67a49c4291f768225cf49
es/values-ko/strings.xml
es/values-zh-rTW/strings_pbap.xml
013de33607d3bcde51074d12ffe4e2c2d734fdcd 14-Apr-2011 Jaikumar Ganesh <jaikumarg@android.com> am 929d38f9: am 3c68bca8: am 138654ff: Merge "The phone did not reject unsupported vCalendar item"

* commit '929d38f9226a00941571804a490e76eb4c6eef10':
The phone did not reject unsupported vCalendar item
929d38f9226a00941571804a490e76eb4c6eef10 14-Apr-2011 Jaikumar Ganesh <jaikumarg@android.com> am 3c68bca8: am 138654ff: Merge "The phone did not reject unsupported vCalendar item"

* commit '3c68bca80f40710b70e3f9173cea167b30a8dcb4':
The phone did not reject unsupported vCalendar item
3c68bca80f40710b70e3f9173cea167b30a8dcb4 14-Apr-2011 Jaikumar Ganesh <jaikumarg@android.com> am 138654ff: Merge "The phone did not reject unsupported vCalendar item"

* commit '138654ff978d6fc784003f87dfb5fda46a6a3703':
The phone did not reject unsupported vCalendar item
138654ff978d6fc784003f87dfb5fda46a6a3703 14-Apr-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "The phone did not reject unsupported vCalendar item"
76d17f9aff4a4aaad0f5af91eee1028473c10b16 06-Dec-2010 Olsson <ola1.olsson@sonyericsson.com> The phone did not reject unsupported vCalendar item

vCalendar is not supported in the phone but it was not
rejected. A blacklist was present in the code but not
used. Hence, this fix enables the blacklist functionality.

Change-Id: I4fefe0e819eb025d37c972cf7e74eabd4f6e6585
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
dbb43cf82c7c6ad8c844c30ac5fb74bf31553f89 07-Apr-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I30623b7c9522b9569b5e5bf4ca9044b286d40aca
es/values-ko/strings.xml
es/values-zh-rTW/strings_pbap.xml
b78d4427e9231983d4c7e856222de4d30c05c712 06-Apr-2011 Eric Fischer <enf@google.com> am 4d62a513: (-s ours) am 5c580cbc: Import revised translations. DO NOT MERGE

* commit '4d62a513448315a289a9b76c2fbba63431716dc3':
Import revised translations. DO NOT MERGE
4d62a513448315a289a9b76c2fbba63431716dc3 06-Apr-2011 Eric Fischer <enf@google.com> am 5c580cbc: Import revised translations. DO NOT MERGE

* commit '5c580cbcf1a2c10c9e0b42f299df481e9a0bfc84':
Import revised translations. DO NOT MERGE
5c580cbcf1a2c10c9e0b42f299df481e9a0bfc84 06-Apr-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I80a2af164c1436888d946961956c4896e7a085e6
es/values-ko/strings.xml
es/values-zh-rTW/strings_pbap.xml
fdd53743b3498251e567e5bd842d945247bc22c4 31-Mar-2011 Daisuke Miyakawa <dmiyakawa@google.com> Merge "Reflect vCard API change"
4b6529651194554bffbeb36baf9b14b09d610e61 31-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> am 59199b74: am a4f55f77: am c298d29b: Merge "Add check for null pointer to avoid crash."

* commit '59199b744c6f107afaac8ec9347d1c04ca6b2ab8':
Add check for null pointer to avoid crash.
3c4d2c77c2fffe675fbe89ba58856686b6873d2f 17-Mar-2011 Daisuke Miyakawa <dmiyakawa@google.com> Reflect vCard API change

Remove dependency toward OneEntryHandler in vCard code.

This change doesn't take care of oom for simplicity.

See also Id623814e8f5961aaf9cf9b4dcc92f75ace401148

Bug: 4066223
Change-Id: I3c5a58fef5a404b992a3c17578eeb63518294231
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
59199b744c6f107afaac8ec9347d1c04ca6b2ab8 30-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> am a4f55f77: am c298d29b: Merge "Add check for null pointer to avoid crash."

* commit 'a4f55f7702bca57c0dbb543ee3e2cb1686e616fc':
Add check for null pointer to avoid crash.
a4f55f7702bca57c0dbb543ee3e2cb1686e616fc 30-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> am c298d29b: Merge "Add check for null pointer to avoid crash."

* commit 'c298d29b081e4240c80750e9431b7189d0b38513':
Add check for null pointer to avoid crash.
c298d29b081e4240c80750e9431b7189d0b38513 30-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "Add check for null pointer to avoid crash."
c7f65fa45bfff61fa9d32d864f9108dfa6e8b12c 30-Mar-2011 Eric Fischer <enf@google.com> am dc0b294b: (-s ours) am 62b1401e: am 85683ad9: (-s ours) Import revised translations. DO NOT MERGE

* commit 'dc0b294b6025d00df52f4869df0f4d6e982567c7':
Import revised translations. DO NOT MERGE
dc0b294b6025d00df52f4869df0f4d6e982567c7 29-Mar-2011 Eric Fischer <enf@google.com> am 62b1401e: am 85683ad9: (-s ours) Import revised translations. DO NOT MERGE

* commit '62b1401efd9b8e6d4d686da110db5b5a48f19676':
Import revised translations. DO NOT MERGE
62b1401efd9b8e6d4d686da110db5b5a48f19676 29-Mar-2011 Eric Fischer <enf@google.com> am 85683ad9: (-s ours) Import revised translations. DO NOT MERGE

* commit '85683ad9a7ec55f92ad7840a60eadddbdda77f08':
Import revised translations. DO NOT MERGE
85683ad9a7ec55f92ad7840a60eadddbdda77f08 29-Mar-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I737163bd4c69d491227d7bb163d34219852c8525
es/values-de/strings.xml
es/values-de/test_strings.xml
es/values-es-rUS/strings.xml
es/values-zh-rTW/strings.xml
b3c06ce9377661a63bc2fbd182c219fd69453b1d 21-Mar-2011 Mathias Jeppsson <mathias.jeppsson@sonyericsson.com> Require bonding and encryption for PBAP server

The Phonebook Access Profile specification requires bonding and
encryption. For devices not supporting SSP (Secure Simple Pairing),
InsecureRfcomm will require neither. Adding EncryptedRfcomm to force
bonding and encryption but not requiring authenticated link key.

Change-Id: I987ca50ff7f60813b5311cead8d6a30a9123d54b
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
b0b55895dd33889ebe3e1117078e4a2e493b2812 19-Mar-2011 Eric Fischer <enf@google.com> am 311f7fa0: (-s ours) am e92baf94: (-s ours) am ada94283: Import revised translations. DO NOT MERGE

* commit '311f7fa07b4be8e7fbe128c59e474baf8fd71f94':
Import revised translations. DO NOT MERGE
311f7fa07b4be8e7fbe128c59e474baf8fd71f94 19-Mar-2011 Eric Fischer <enf@google.com> am e92baf94: (-s ours) am ada94283: Import revised translations. DO NOT MERGE

* commit 'e92baf9466a26ea83d2b4f59b2b232b9fc641bd8':
Import revised translations. DO NOT MERGE
e92baf9466a26ea83d2b4f59b2b232b9fc641bd8 19-Mar-2011 Eric Fischer <enf@google.com> am ada94283: Import revised translations. DO NOT MERGE

* commit 'ada94283cbb98320b4db9d8bac9a4d1b452fc90d':
Import revised translations. DO NOT MERGE
ada94283cbb98320b4db9d8bac9a4d1b452fc90d 18-Mar-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: Iddb27f5a792b07f058ea99944b8a2b7b16defc31
es/values-de/strings.xml
es/values-de/test_strings.xml
es/values-es-rUS/strings.xml
es/values-nl/strings.xml
es/values-zh-rTW/strings.xml
d0c226d10de4a1a0578af7187943cb9a6e31df8c 15-Mar-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I2c1e2bbc0f13029dcc006fcdf109340faa27b472
es/values-de/strings.xml
es/values-de/test_strings.xml
es/values-es-rUS/strings.xml
es/values-zh-rTW/strings.xml
6b923ee6bf0c80dc4edeabb3694132f3fd40ce03 10-Mar-2011 Daisuke Miyakawa <dmiyakawa@google.com> Use old version of vCard composition method

Must be after I91b65f881e1712ecf82c2e119a92bc70c43c623c

Bug: 4066223
Change-Id: Icca2019b10fc84e437efbc2606cd5703b3ea0a5f
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
03f2f49a0f5ae7f894e382ff93a277af003563b8 09-Mar-2011 Eric Fischer <enf@google.com> am d044db9f: (-s ours) Import revised translations. DO NOT MERGE

* commit 'd044db9f939c54745282317a70cc2c4d8b059a18':
Import revised translations. DO NOT MERGE
d044db9f939c54745282317a70cc2c4d8b059a18 09-Mar-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I9f181ff46c8dfe67e859eff9e55327cef576e8f9
es/values-zh-rTW/strings.xml
23b8f8c57a7cb820c6dd9a8ed6a78cd2a3c625ae 04-Mar-2011 Eric Fischer <enf@google.com> am 99f00d0f: (-s ours) Import revised translations. DO NOT MERGE

* commit '99f00d0f26dfc92cc073061bb964a8f30208f1ca':
Import revised translations. DO NOT MERGE
99f00d0f26dfc92cc073061bb964a8f30208f1ca 04-Mar-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: Ib5e3d6782bfbaec686c1df3a5bfe029f976a62c2
es/values-es-rUS/strings.xml
27418b7d08c0a9c33e8a09f20ea10da5076c291d 04-Mar-2011 Eric Fischer <enf@google.com> am d0ab3962: (-s ours) Import revised translations. DO NOT MERGE

* commit 'd0ab3962cb5def502e280e890e737eb1b4c0b37d':
Import revised translations. DO NOT MERGE
d0ab3962cb5def502e280e890e737eb1b4c0b37d 03-Mar-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: Ibdd6c8b84db0e30b7f333e9c656265f428bab7a7
es/values-de/strings.xml
es/values-de/test_strings.xml
b578901842759d961a24eb80116c78b5c6e0253a 01-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> am 546cd75f: am 78c1c0ee: am c5813a6d: Merge "Check if BT is allowed in airplane mode"

* commit '546cd75ff46beb4fbf07f572b968b330c9dc5cee':
Check if BT is allowed in airplane mode
10bfbe9b127411726696b3ec08b63084d3a61758 01-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> am 2abac73f: am 69eca7b7: am 72d2f1d8: Merge "Handle pullVcardListing req without search value for Number attr."

* commit '2abac73f9babf24702f94a0428b8d7f9201c4757':
Handle pullVcardListing req without search value for Number attr.
77650aee9382df381625701bcb3047bf3368e9db 01-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> am 5d08ec3f: am d66fc8a9: am 89a69665: Merge "Fix \'New Missed Calls\' count in PullvCardListing"

* commit '5d08ec3f563803231ae5e775acd044e91b217047':
Fix 'New Missed Calls' count in PullvCardListing
546cd75ff46beb4fbf07f572b968b330c9dc5cee 01-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> am 78c1c0ee: am c5813a6d: Merge "Check if BT is allowed in airplane mode"

* commit '78c1c0eee41a1b6c6a259661d62d62d78841ad1f':
Check if BT is allowed in airplane mode
2abac73f9babf24702f94a0428b8d7f9201c4757 01-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> am 69eca7b7: am 72d2f1d8: Merge "Handle pullVcardListing req without search value for Number attr."

* commit '69eca7b7e77cb55f92b3eafd09f15be5644c3a4f':
Handle pullVcardListing req without search value for Number attr.
5d08ec3f563803231ae5e775acd044e91b217047 01-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> am d66fc8a9: am 89a69665: Merge "Fix \'New Missed Calls\' count in PullvCardListing"

* commit 'd66fc8a97924a5af8212d1b398011d2076d6c2cd':
Fix 'New Missed Calls' count in PullvCardListing
98a53e5bdb2500109c304f2b5364c1715ab745d8 06-Dec-2010 martin ma <martin.ma@sonyericsson.com> Add check for null pointer to avoid crash.

This is added in order to prevent a crash. Also, updating the name
of a device to null, making it appear as 'Unknown', is probably not
intended.

Change-Id: Ibd3c93741489aae9118ba7b45223d58d5de6812f
rc/com/android/bluetooth/opp/BluetoothOppPreference.java
78c1c0eee41a1b6c6a259661d62d62d78841ad1f 01-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> am c5813a6d: Merge "Check if BT is allowed in airplane mode"

* commit 'c5813a6dcf079202d8dce16a37cbadd427804d9c':
Check if BT is allowed in airplane mode
69eca7b7e77cb55f92b3eafd09f15be5644c3a4f 01-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> am 72d2f1d8: Merge "Handle pullVcardListing req without search value for Number attr."

* commit '72d2f1d8b81087c0a00310ff43e5d060dc8b7867':
Handle pullVcardListing req without search value for Number attr.
d66fc8a97924a5af8212d1b398011d2076d6c2cd 01-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> am 89a69665: Merge "Fix \'New Missed Calls\' count in PullvCardListing"

* commit '89a696651197f313786842ec0e2656ea6211bfdc':
Fix 'New Missed Calls' count in PullvCardListing
c5813a6dcf079202d8dce16a37cbadd427804d9c 01-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "Check if BT is allowed in airplane mode"
72d2f1d8b81087c0a00310ff43e5d060dc8b7867 01-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "Handle pullVcardListing req without search value for Number attr."
89a696651197f313786842ec0e2656ea6211bfdc 01-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "Fix 'New Missed Calls' count in PullvCardListing"
d6a1c1c4bf3da920582e17c8c6e32c7ef74a555f 08-Jan-2011 Jaikumar Ganesh <jaikumar@google.com> Retry rfcomm socket connections after link key exchange error.

If the devices were paired before, but unpaired on the
remote end, it will return an error (when sending a file)for the auth
request for the socket connection. Link keys will get exchanged
but we need to retry the socket connection. There is no good way to
inform this socket asking it to retry apart from
a delayed retry. The socket is opened at the kernel level
but the link key retrys happen at the Bluez userspace level.

Note: This is a temporary change, once the new mgmt interface comes
up in Bluez, we wouldn't need this.

Change-Id: Ifbd93d7f69b93515dda6c6f4ad2796853f9d5841
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
66b7bea43b30c8a770229e961d9c18053726bd79 24-Feb-2011 Eric Fischer <enf@google.com> Merge "Import revised translations."
503ca0854c6c4ace4576b72e228ca24847b2a537 24-Feb-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I221a4829a2e4de58110acd4657b6333b3e31eab4
es/values-nl/strings.xml
658adc3c66a717e6b98d72e19de74969673423ae 24-Feb-2011 Eric Fischer <enf@google.com> am f3288cc1: (-s ours) am 74a63860: Import revised translations. DO NOT MERGE

* commit 'f3288cc14c4f3bc50ad2b0d137a7ca375f631b5c':
Import revised translations. DO NOT MERGE
f3288cc14c4f3bc50ad2b0d137a7ca375f631b5c 24-Feb-2011 Eric Fischer <enf@google.com> am 74a63860: Import revised translations. DO NOT MERGE

* commit '74a6386000e2ee82ef7f533b4d56a5f68972cbe5':
Import revised translations. DO NOT MERGE
74a6386000e2ee82ef7f533b4d56a5f68972cbe5 24-Feb-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I72dda3fe3c968e8af4348c99a630f4b312d7bf0b
es/values-nl/strings.xml
0364300c203a934d59e5bb1da63b0df067676aa8 17-Feb-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: Ib40d6f9835ef2025200b300f4e46a85a33598960
es/values-sv/strings.xml
a85ff0a96f7d5f64bf1e9ca99789cb8dc69f6d97 05-Jan-2011 Kevin LeBlanc <kevin.leblanc@sonyericsson.com> Check if BT is allowed in airplane mode

Currenty, the bluetooth sharing activity always quits with an error
message if airplane mode is on. Instead, the activity should check
if bluetooth may be enabled in airplane mode, given the current
system settings.

Change-Id: If9272a941504054d7819e0248f93a8b5bca8d41e
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
4bba23a751f042596561eab0e677135d5267bcdf 07-Jan-2011 Staffan Lindvall <staffan.lindvall.x@sonyericsson.com> Handle pullVcardListing req without search value for Number attr.

When sending pullVcardListing request to the phone while using
the search attribute "Number" without any search value, the
phone responds with error code "internal error".

Instead the phone should return all numbers in the phonebook.

Change-Id: I7c11b76bbd61882c62be3533b1c45c2c72f497b2
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
9c67a8b5275e5b5754f02d43b57ed35314c9f5fb 01-Feb-2011 Eric Fischer <enf@google.com> am 665e977c: (-s ours) am e904e836: Import revised translations. DO NOT MERGE. Bug 3394542

* commit '665e977c3af5367dc978762ac4a07259f066c7a2':
Import revised translations. DO NOT MERGE. Bug 3394542
665e977c3af5367dc978762ac4a07259f066c7a2 01-Feb-2011 Eric Fischer <enf@google.com> am e904e836: Import revised translations. DO NOT MERGE. Bug 3394542

* commit 'e904e836da640e34d334d09b4b1f8cedd24553ce':
Import revised translations. DO NOT MERGE. Bug 3394542
c3e2b1d5d07fa4793b11b457ba399528cfb90ddc 01-Feb-2011 Eric Fischer <enf@google.com> am 84fa4385: (-s ours) am 49283ea8: (-s ours) am d67d4059: Import revised translations. DO NOT MERGE

* commit '84fa438510467de6b9dce9a633ffdd9ae7efab8b':
Import revised translations. DO NOT MERGE
84fa438510467de6b9dce9a633ffdd9ae7efab8b 01-Feb-2011 Eric Fischer <enf@google.com> am 49283ea8: (-s ours) am d67d4059: Import revised translations. DO NOT MERGE

* commit '49283ea87f6b66d641206dacfe6a3bba0942b551':
Import revised translations. DO NOT MERGE
49283ea87f6b66d641206dacfe6a3bba0942b551 01-Feb-2011 Eric Fischer <enf@google.com> am d67d4059: Import revised translations. DO NOT MERGE

* commit 'd67d40591c19d2c146dca5fbf91d76d1e7c2ab82':
Import revised translations. DO NOT MERGE
e904e836da640e34d334d09b4b1f8cedd24553ce 31-Jan-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE. Bug 3394542

Change-Id: I91290d6460a47760f369b01d732da1bcde21e3e3
es/values-sv/strings.xml
d67d40591c19d2c146dca5fbf91d76d1e7c2ab82 31-Jan-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I3447cf958ca1f28c1eda610d635391c006993b4a
es/values-sv/strings.xml
cc3631dcd65874e83bbeb12dee4ccab532f3bf27 30-Jan-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: Ia3c640aac588937979c2adf597f692e95a239819
57527df77908faf7bd341cfcdb7af92700526067 30-Jan-2011 The Android Open Source Project <initial-contribution@android.com> Mass merge from gingerbread - do not merge

Change-Id: Iaa45284ab43b861aa704076779b43434fa70b378
e10421dda2b0acedd53d221195a45f7d0018ef4f 27-Jan-2011 Dianne Hackborn <hackbod@google.com> am 9613628e: Merge "Remove redundant translations." into honeycomb

* commit '9613628e48cb303a4c715918d70cc3aa45408e27':
Remove redundant translations.
9613628e48cb303a4c715918d70cc3aa45408e27 27-Jan-2011 Dianne Hackborn <hackbod@google.com> Merge "Remove redundant translations." into honeycomb
3b6d79c6637e1f4e6edf7f97d151bb3b620ef1ff 27-Jan-2011 Eric Fischer <enf@google.com> Remove redundant translations.

Change-Id: I700e1fccf2db854af54353145ef82b1bc4418df6
es/values-es-rUS-xlarge/strings.xml
ca8f0978f54f742151415cff8c094a3655679492 26-Jan-2011 Jake Hamby <jhamby@google.com> am 1ed96d52: Implement "show received files" intent for Settings.

* commit '1ed96d522298e8f48690a4f4cbf2e0c6b402e3a0':
Implement "show received files" intent for Settings.
1ed96d522298e8f48690a4f4cbf2e0c6b402e3a0 26-Jan-2011 Jake Hamby <jhamby@google.com> Implement "show received files" intent for Settings.

Add a handler for a new intent (sent from the Settings app) to
show all files received via Bluetooth. This is equivalent to the
now deprecated live folder view of received files.

Bug: 3167219
Change-Id: Ibb8d3738d62301af5b012489a69ac078e554b66d
ndroidManifest.xml
es/menu/receivedfilescontextfinished.xml
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppTransferHistory.java
rc/com/android/bluetooth/opp/Constants.java
5e573987a8c4854cb9d49f0916a30f9d37ad57e9 26-Jan-2011 Jaikumar Ganesh <jaikumar@google.com> am c313dd80: Cannot cancel files transfer shared using Bluetooth.

* commit 'c313dd80229d7889c10983907d34c34af54e6089':
Cannot cancel files transfer shared using Bluetooth.
c313dd80229d7889c10983907d34c34af54e6089 26-Jan-2011 Jaikumar Ganesh <jaikumar@google.com> Cannot cancel files transfer shared using Bluetooth.

If these views are clickable, the parent view doesn't get the events and you
can't click on the notification.
Bug:3173077

Change-Id: I1e293e2f6d16081b78c430dd61da35ad1a24f8bc
es/layout/status_bar_ongoing_event_progress_bar.xml
e7b695648951f167cb880d99dd83fa2bb96afca8 25-Jan-2011 Eric Fischer <enf@google.com> am aa11beb4: (-s ours) Import translations for additional languages.

* commit 'aa11beb42a9f79bd18275b20baf95b800a0e01d1':
Import translations for additional languages.
d3be864674fec2806d252598f8638121140468aa 11-Jan-2011 Eric Fischer <enf@google.com> am 6af09a60: (-s ours) am aa11beb4: Import translations for additional languages.

* commit '6af09a604d2bd0ee7ab4fe0bcf20086d956f86a1':
Import translations for additional languages.
e1fb5654d9de951cf9780361632cdfa15eea6294 11-Jan-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "Fix 'New Missed Calls' count in PullvCardListing" into honeycomb
afdc7cbd31e835ce4610338b54e0de1337957cc8 07-Jan-2011 Yoshiharu Kurita <yoshiharu.x.kurita@sonyericsson.com> Fix 'New Missed Calls' count in PullvCardListing

When the phone receives a PullvCardListing request about mch
(Missed Call History), PBAP application sends a corresponding
response which contains the number of 'New Missed Calls' in
the header. Currently, the number of 'New Missed Calls' is
included into a response against the other type of
PullvCardListing request after the phone receives mch
PullvCardListing request which contains MaxListCount = 0 and
ListStartOffset = 0 (these parameters mean PCE only wants the
number of index), because any of PullvCardListing requests
are miss-detected as mch in this case. And then the internal
value for 'New Missed Calls' is also updated, so the number
of 'New Missed Calls' becomes incorrect when answering the
next PullvCardListing about mch.

The solution is to fix the miss detection.

Change-Id: Ic09257fc554d8b7af9498d2ff79e017f6e56510c
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
b27df66a5d9c72487369920424248ef6dc391b9a 11-Jan-2011 Jaikumar Ganesh <jaikumar@google.com> Convert dialogs to holographic style.

Change-Id: If0fccab3d47c875f76bd6658c957e294bab28001
ndroidManifest.xml
ndroidManifest_test.xml
9522370104410f24602ac98172bfbda27f89780d 07-Jan-2011 Yoshiharu Kurita <yoshiharu.x.kurita@sonyericsson.com> Fix 'New Missed Calls' count in PullvCardListing

When the phone receives a PullvCardListing request about mch
(Missed Call History), PBAP application sends a corresponding
response which contains the number of 'New Missed Calls' in
the header. Currently, the number of 'New Missed Calls' is
included into a response against the other type of
PullvCardListing request after the phone receives mch
PullvCardListing request which contains MaxListCount = 0 and
ListStartOffset = 0 (these parameters mean PCE only wants the
number of index), because any of PullvCardListing requests
are miss-detected as mch in this case. And then the internal
value for 'New Missed Calls' is also updated, so the number
of 'New Missed Calls' becomes incorrect when answering the
next PullvCardListing about mch.

The solution is to fix the miss detection.

Change-Id: Ic09257fc554d8b7af9498d2ff79e017f6e56510c
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
0995f126a9835d63a87d4c2c985a43004978c94d 07-Jan-2011 Staffan Lindvall <staffan.lindvall.x@sonyericsson.com> Handle pullVcardListing req without search value for Number attr.

When sending pullVcardListing request to the phone while using
the search attribute "Number" without any search value, the
phone responds with error code "internal error".

Instead the phone should return all numbers in the phonebook.

Change-Id: I7c11b76bbd61882c62be3533b1c45c2c72f497b2
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
6af09a604d2bd0ee7ab4fe0bcf20086d956f86a1 07-Jan-2011 Eric Fischer <enf@google.com> am aa11beb4: Import translations for additional languages.

* commit 'aa11beb42a9f79bd18275b20baf95b800a0e01d1':
Import translations for additional languages.
ba8bd944fb4dbfdd710454912fa17649274fba0b 07-Jan-2011 Eric Fischer <enf@google.com> Import some unabbreviated translations for large screens.

Change-Id: Ie0bc128f485bc80c0251ca80855d4d04290e656a
es/values-es-rUS-xlarge/strings.xml
aa11beb42a9f79bd18275b20baf95b800a0e01d1 06-Jan-2011 Eric Fischer <enf@google.com> Import translations for additional languages.

Change-Id: Ia609288d3ec68f17d38203421bb9ddaab7ebdbde
es/values-ar/strings.xml
es/values-ar/strings_pbap.xml
es/values-ar/test_strings.xml
es/values-bg/strings.xml
es/values-bg/strings_pbap.xml
es/values-bg/test_strings.xml
es/values-ca/strings.xml
es/values-ca/strings_pbap.xml
es/values-ca/test_strings.xml
es/values-de/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rGB/strings_pbap.xml
es/values-en-rGB/test_strings.xml
es/values-fa/strings.xml
es/values-fa/strings_pbap.xml
es/values-fa/test_strings.xml
es/values-fi/strings.xml
es/values-fi/strings_pbap.xml
es/values-fi/test_strings.xml
es/values-hr/strings.xml
es/values-hr/strings_pbap.xml
es/values-hr/test_strings.xml
es/values-hu/strings.xml
es/values-hu/strings_pbap.xml
es/values-hu/test_strings.xml
es/values-in/strings.xml
es/values-in/strings_pbap.xml
es/values-in/test_strings.xml
es/values-iw/strings.xml
es/values-iw/strings_pbap.xml
es/values-iw/test_strings.xml
es/values-lt/strings.xml
es/values-lt/strings_pbap.xml
es/values-lt/test_strings.xml
es/values-lv/strings.xml
es/values-lv/strings_pbap.xml
es/values-lv/test_strings.xml
es/values-rm/strings.xml
es/values-rm/strings_pbap.xml
es/values-rm/test_strings.xml
es/values-ro/strings.xml
es/values-ro/strings_pbap.xml
es/values-ro/test_strings.xml
es/values-sk/strings.xml
es/values-sk/strings_pbap.xml
es/values-sk/test_strings.xml
es/values-sl/strings.xml
es/values-sl/strings_pbap.xml
es/values-sl/test_strings.xml
es/values-sr/strings.xml
es/values-sr/strings_pbap.xml
es/values-sr/test_strings.xml
es/values-th/strings.xml
es/values-th/strings_pbap.xml
es/values-th/test_strings.xml
es/values-tl/strings.xml
es/values-tl/strings_pbap.xml
es/values-tl/test_strings.xml
es/values-uk/strings.xml
es/values-uk/strings_pbap.xml
es/values-uk/test_strings.xml
es/values-vi/strings.xml
es/values-vi/strings_pbap.xml
es/values-vi/test_strings.xml
c83ffa5289995a4071b5d84055da07e2c72de2d9 05-Jan-2011 Kevin LeBlanc <kevin.leblanc@sonyericsson.com> Check if BT is allowed in airplane mode

Currenty, the bluetooth sharing activity always quits with an error
message if airplane mode is on. Instead, the activity should check
if bluetooth may be enabled in airplane mode, given the current
system settings.

Change-Id: If9272a941504054d7819e0248f93a8b5bca8d41e
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
091ff0151b6b3094ba712e63529d3caaf0f42090 28-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am 3500d1cc: Merge "BT - Not possible to accept incoming obex transfers using key-presses."

* commit '3500d1cc714807945b1427e43eb3bde367849e43':
BT - Not possible to accept incoming obex transfers using key-presses.
3500d1cc714807945b1427e43eb3bde367849e43 28-Dec-2010 Jean-Baptiste Queru <jbq@google.com> Merge "BT - Not possible to accept incoming obex transfers using key-presses."
227e60370e1c070315a43044bfdb77e1efb1393b 28-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am cbb50b68: Merge "Incorrect response code after pull of invalid vCard handle."

* commit 'cbb50b684e181f78d3ca5b304e97f9c5a67809b6':
Incorrect response code after pull of invalid vCard handle.
f0e1bc31822d23c1c8bccf1ab17907a1d803a62d 28-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am 89186622: Merge "Sanitise Bluetooth file name hint when receiving a contact"

* commit '89186622fa240083a46336a9e5e4ade52c5698d9':
Sanitise Bluetooth file name hint when receiving a contact
cbb50b684e181f78d3ca5b304e97f9c5a67809b6 28-Dec-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Incorrect response code after pull of invalid vCard handle."
6f02f510e5dc3fb994516128f2de1d78bc7f9b1e 07-Dec-2010 Staffan Lindvall <staffan.lindvall.x@sonyericsson.com> Incorrect response code after pull of invalid vCard handle.

When calling pullVcardEntry with an invalid / non-existing
vCard handle the response code is always "OK".

Instead the phone should respond "NOT FOUND" according
to Bluetooth PBAP specification.

The problem exists both for phonebook and call logs.

Change-Id: I339b1fe0cdb7fa9b6c6b425f1b1686c24cab9626
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
89186622fa240083a46336a9e5e4ade52c5698d9 28-Dec-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Sanitise Bluetooth file name hint when receiving a contact"
73b53d57ae9fc64fe0c22b262f72ce84d5095a98 23-Dec-2010 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I620aca53e075ed5914893c9e767184ba3d2a5621
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-en-rGB/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
5e9a02df66c6044bd4a06b9d53e6cdbd8ad22606 28-Sep-2010 Edward Savage-Jones <edward.savage-jones@sonyericsson.com> Sanitise Bluetooth file name hint when receiving a contact

If a contact name is entered with any of the following characters

:"<>*?|\n\t

the transfer of that contact fails. This is due to the underlying
filesystem (FAT) not being able to handle these characters in a
file name. This fix corrects that situation by replacing any
whitespace characters with a space and illegal FAT filesystem
characters with underscore.

Change-Id: I5021bd26a16c31810a61bac3f70439c1153451c2
rc/com/android/bluetooth/opp/BluetoothOppReceiveFileInfo.java
9935a310a4f36c9f835c5c3aa2f604ddc36cabb1 21-Dec-2010 Xiaodong Xu <xiaodong.xu@sonyericsson.com> Bluetooth: Add vCard version support for call history.

Under current implementation, PSE only deliver call history
under format VCard2.1 to PCE, this is not correct according to
PBAP specification, which says "The PSE shall support both
vCard2.1 and vCard3.0 versions and deliver the Entries to the
PCE under the format version that is requested by the PCE."
This fix is to make implementation following such PBAP
specificaiton.

Change-Id: Id0146d0887bad3bd066109ecd3be674b3106bced
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
06a430f47fd868a0c2cde832e9d60297c76a264f 14-Dec-2010 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I51980b4322124dbeef5adebfffa74bc2e46cfe6f
es/values-de/strings.xml
es/values-el/strings.xml
es/values-fr/strings.xml
es/values-lv/strings.xml
es/values-uk/strings.xml
e5d2894146024d6a5374cdb9868c1566f3ed4b32 10-Dec-2010 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I6c7914d39af9c2731d731830a6c9d12a7abf5c48
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
0b13debc0aaca69bbef781da47a2ca5c0e6d9af7 08-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am e7f887da: resolved conflicts for merge of 55936599 to stage-korg-master

* commit 'e7f887dab2591a46ecf80616e00f33bb5d847935':
code cleanup. unused imports, local variabls and static constans removed from com.android.bluetooth.opp package.
e7f887dab2591a46ecf80616e00f33bb5d847935 07-Dec-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 55936599 to stage-korg-master

Change-Id: I5f04a3ae2f0246853f16b0fdb209e67df95e6ca8
e1fd97242bcac3c546c35a2576df3fafee04d25a 07-Dec-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 22e1e357 to master

Change-Id: I96ff536c0d1c000a6b6d5b0b2ea5a3849b21985e
55936599e88a156fb132a68c2e93d77fdd4e8a2e 07-Dec-2010 Jean-Baptiste Queru <jbq@google.com> Merge "code cleanup. unused imports, local variabls and static constans removed from com.android.bluetooth.opp package."
22e1e357b6053b572820b54ed8f2b8fe3c1eb0f8 07-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am 16d171b1: Merge "code cleanup. some unused import statement, local variabls, private members and static constants removed form classes in com.android.bluetooth/pbap package."

* commit '16d171b1ba7bd2b74c15b9f4d0289de84117cbb5':
code cleanup. some unused import statement, local variabls, private members and static constants removed form classes in com.android.bluetooth/pbap package.
16d171b1ba7bd2b74c15b9f4d0289de84117cbb5 07-Dec-2010 Jean-Baptiste Queru <jbq@google.com> Merge "code cleanup. some unused import statement, local variabls, private members and static constants removed form classes in com.android.bluetooth/pbap package."
30e615de6f8d5c407ba53ac98845887c331c51ff 02-Dec-2010 Eric Fischer <enf@google.com> Rename Indonesian and Hebrew translations to match Locale.java conventions

Change-Id: I581dcd7bd932ba48f21388cfc16d3c033ec9c7d6
es/values-he/strings.xml
es/values-he/strings_pbap.xml
es/values-he/test_strings.xml
es/values-id/strings.xml
es/values-id/strings_pbap.xml
es/values-id/test_strings.xml
es/values-in/strings.xml
es/values-in/strings_pbap.xml
es/values-in/test_strings.xml
es/values-iw/strings.xml
es/values-iw/strings_pbap.xml
es/values-iw/test_strings.xml
32dc124d1d704e30ad7de1a9b6ba4702dba782f7 30-Nov-2010 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I5900ca6df7e3099b354e792b9287733380e38d13
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-en-rGB/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-he/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-id/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
8616fe39a97d09c1753c8a85181cd24327901c57 18-Nov-2010 Eric Fischer <enf@google.com> Import initial translations for 20 new locales.

Change-Id: Ic441b87aeb0da31a26c1301cfa487e3eba516fc5
es/values-ar/strings.xml
es/values-ar/strings_pbap.xml
es/values-ar/test_strings.xml
es/values-bg/strings.xml
es/values-bg/strings_pbap.xml
es/values-bg/test_strings.xml
es/values-ca/strings.xml
es/values-ca/strings_pbap.xml
es/values-ca/test_strings.xml
es/values-en-rGB/strings.xml
es/values-en-rGB/strings_pbap.xml
es/values-en-rGB/test_strings.xml
es/values-fa/strings.xml
es/values-fa/strings_pbap.xml
es/values-fa/test_strings.xml
es/values-fi/strings.xml
es/values-fi/strings_pbap.xml
es/values-fi/test_strings.xml
es/values-he/strings.xml
es/values-he/strings_pbap.xml
es/values-he/test_strings.xml
es/values-hr/strings.xml
es/values-hr/strings_pbap.xml
es/values-hr/test_strings.xml
es/values-hu/strings.xml
es/values-hu/strings_pbap.xml
es/values-hu/test_strings.xml
es/values-id/strings.xml
es/values-id/strings_pbap.xml
es/values-id/test_strings.xml
es/values-lt/strings.xml
es/values-lt/strings_pbap.xml
es/values-lt/test_strings.xml
es/values-lv/strings.xml
es/values-lv/strings_pbap.xml
es/values-lv/test_strings.xml
es/values-ro/strings.xml
es/values-ro/strings_pbap.xml
es/values-ro/test_strings.xml
es/values-sk/strings.xml
es/values-sk/strings_pbap.xml
es/values-sk/test_strings.xml
es/values-sl/strings.xml
es/values-sl/strings_pbap.xml
es/values-sl/test_strings.xml
es/values-sr/strings.xml
es/values-sr/strings_pbap.xml
es/values-sr/test_strings.xml
es/values-th/strings.xml
es/values-th/strings_pbap.xml
es/values-th/test_strings.xml
es/values-tl/strings.xml
es/values-tl/strings_pbap.xml
es/values-tl/test_strings.xml
es/values-uk/strings.xml
es/values-uk/strings_pbap.xml
es/values-uk/test_strings.xml
es/values-vi/strings.xml
es/values-vi/strings_pbap.xml
es/values-vi/test_strings.xml
d41c5d148432fd52031383929c469e7ea3fcff03 17-Nov-2010 Gilles Debunne <debunne@google.com> Merge "Removed unused assets."
941db7cbdc1c0e6cba53d14d7e0eb3e6be40bd01 16-Nov-2010 Daisuke Miyakawa <dmiyakawa@google.com> Use system coler for Notification message.

Current UI uses black for background, so all texts in
Bluetooth notifications are invisible. Same root cause as
Ibb4b91e025ba89ed202c7919a89ecd8c9bd7e24a

Change-Id: I1e8daed46e7f8ebbb6e884436b51d4784adcdec0
es/layout/status_bar_ongoing_event_progress_bar.xml
febc482c3c0a257cce91cfa1b7a32398a6964e35 16-Nov-2010 Gilles Debunne <debunne@google.com> Removed unused assets.

Change-Id: Id53fed964a8cd577c115dbc7f1334fd1d59c9cdd
es/drawable-hdpi/icon.png
es/drawable-mdpi/icon.png
9b6f692121b0abd3032ba8e153997e918bc18e3f 12-Nov-2010 Eric Fischer <enf@google.com> am 84f70555: (-s ours) am 2acef5de: Import revised translations. DO NOT MERGE

* commit '84f705552c547c5697578653c727c12e23c8f486':
Import revised translations. DO NOT MERGE
84f705552c547c5697578653c727c12e23c8f486 12-Nov-2010 Eric Fischer <enf@google.com> am 2acef5de: Import revised translations. DO NOT MERGE

* commit '2acef5dec3faa043fc433f4f7f22a3e002d89bd0':
Import revised translations. DO NOT MERGE
695f5283d4e2364c60fcc5db3fa2a689bacd813d 10-Nov-2010 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I7731593d9573ea3f21f40f8ab8df36992279db86
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-rm/strings_pbap.xml
es/values-rm/test_strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
2acef5dec3faa043fc433f4f7f22a3e002d89bd0 09-Nov-2010 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I63625c958e02adf11ab0dd21c0432a924acb5b57
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
c90160ba6095a91d3e3c24d86eb226b158569f03 04-Nov-2010 Eric Fischer <enf@google.com> Split strings referring to "phone" into phone and tablet variants.

Change-Id: I27f5782a762896d6faba89d3d7d2319db8b47f27
es/values/strings.xml
a930b6831d0c70b6c5d34e548e6b1dceaa6529a0 01-Nov-2010 Mohammad Shamsi <m.h.shams@gmail.com> code cleanup.
unused imports, local variabls and static constans removed from
com.android.bluetooth.opp package.

Change-Id: I0fd682a190221e216fac71723c05d3828b9fa42d
rc/com/android/bluetooth/opp/BluetoothOppBatch.java
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppPreference.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
rc/com/android/bluetooth/opp/BluetoothOppTransferHistory.java
rc/com/android/bluetooth/opp/TestActivity.java
cff3303d1878037f35c9feb58e0c747aef403d4d 01-Nov-2010 Mohammad Shamsi <m.h.shams@gmail.com> code cleanup.
some unused import statement, local variabls, private members and static constants removed form
classes in com.android.bluetooth/pbap package.

Change-Id: I95d7d403ab78afa6f9ada82cfb357056a6bf61d0
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
853b87c507326d0a19dc6cedfaba641942623b8a 27-Oct-2010 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I5b337570698d0ab7bb6c7fc873a78bf3261e368a
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
84ec2fa756c3e918b6083726271128096de57ffb 23-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> Send CONNECTION_STATE_CHANGE intent.

Change-Id: Ibbf53b1f96d92c9d0c6acbfc491e93046136e95d
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
60448e72c2c6559abc1a5deb00791eb54a444389 26-Oct-2010 Eric Fischer <enf@google.com> am 7c40d5ee: (-s ours) am afd569b4: Import revised translations. DO NOT MERGE

Merge commit '7c40d5ee855c4468d74b7ce030415763a9649ff7'

* commit '7c40d5ee855c4468d74b7ce030415763a9649ff7':
Import revised translations. DO NOT MERGE
7c40d5ee855c4468d74b7ce030415763a9649ff7 26-Oct-2010 Eric Fischer <enf@google.com> am afd569b4: Import revised translations. DO NOT MERGE

Merge commit 'afd569b4b294e226fa6c35a4ee863bd189daf62a' into gingerbread-plus-aosp

* commit 'afd569b4b294e226fa6c35a4ee863bd189daf62a':
Import revised translations. DO NOT MERGE
afd569b4b294e226fa6c35a4ee863bd189daf62a 26-Oct-2010 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I3067481b00b451811cce1795d23f5c9402bdaa04
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
9b016a7f77bbee70ed94006eef1f674b93c8a1ce 26-Oct-2010 Eric Fischer <enf@google.com> am f80b655f: (-s ours) am c0460579: Import revised translations. DO NOT MERGE

Merge commit 'f80b655f8b9058a2501476e5c8cc9b9743d4e132'

* commit 'f80b655f8b9058a2501476e5c8cc9b9743d4e132':
Import revised translations. DO NOT MERGE
f80b655f8b9058a2501476e5c8cc9b9743d4e132 26-Oct-2010 Eric Fischer <enf@google.com> am c0460579: Import revised translations. DO NOT MERGE

Merge commit 'c0460579699b696eceec5eadbfcdc1543aa45929' into gingerbread-plus-aosp

* commit 'c0460579699b696eceec5eadbfcdc1543aa45929':
Import revised translations. DO NOT MERGE
c0460579699b696eceec5eadbfcdc1543aa45929 26-Oct-2010 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: Ia8c5a9b2ad897e37c09be2a951c6734e637bb145
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
4786cee522534ce296f6a209730f6e6e455df46a 21-Oct-2010 Eric Fischer <enf@google.com> am a769c2b2: am 2acd43d3: Replace shared storage with USB storage.

Merge commit 'a769c2b2b13bff94cf21deada89f0ededac6a2b2'

* commit 'a769c2b2b13bff94cf21deada89f0ededac6a2b2':
Replace shared storage with USB storage.
a769c2b2b13bff94cf21deada89f0ededac6a2b2 20-Oct-2010 Eric Fischer <enf@google.com> am 2acd43d3: Replace shared storage with USB storage.

Merge commit '2acd43d31cf5ffdda9b4e72a303c1db7205af613' into gingerbread-plus-aosp

* commit '2acd43d31cf5ffdda9b4e72a303c1db7205af613':
Replace shared storage with USB storage.
2acd43d31cf5ffdda9b4e72a303c1db7205af613 20-Oct-2010 Eric Fischer <enf@google.com> Replace shared storage with USB storage.

Change-Id: Ia32a91daad6e0247fa6d870207d56724535d0f61
es/values/strings.xml
691a8a6193fbce96d7e12e99d72dc68253d9b4c5 18-Oct-2010 Kenny Root <kroot@google.com> am 4099df64: (-s ours) am b141d86c: Import revised translations DO NOT MERGE

Merge commit '4099df64e3aae5a0475d5e22074497900d9459b7'

* commit '4099df64e3aae5a0475d5e22074497900d9459b7':
Import revised translations DO NOT MERGE
43b84dcd7be5bdde8279c820d1706bed80a165a3 16-Oct-2010 Kenny Root <kroot@google.com> am c0dcd8d4: (-s ours) am 7facaf19: Import revised translations

Merge commit 'c0dcd8d449e110130307577973f512cd9afb8e25'

* commit 'c0dcd8d449e110130307577973f512cd9afb8e25':
Import revised translations
4099df64e3aae5a0475d5e22074497900d9459b7 16-Oct-2010 Kenny Root <kroot@google.com> am b141d86c: Import revised translations DO NOT MERGE

Merge commit 'b141d86cda32d072851ee661caa7ddaa20526aeb' into gingerbread-plus-aosp

* commit 'b141d86cda32d072851ee661caa7ddaa20526aeb':
Import revised translations DO NOT MERGE
b141d86cda32d072851ee661caa7ddaa20526aeb 16-Oct-2010 Kenny Root <kroot@google.com> Import revised translations DO NOT MERGE

Change-Id: I70140735d15c789f795d5fdd3759d6666d3798ea
es/values-sv/strings.xml
c0dcd8d449e110130307577973f512cd9afb8e25 14-Oct-2010 Kenny Root <kroot@google.com> am 7facaf19: Import revised translations

Merge commit '7facaf194dfe5b1d2bb2e59dfca355db07d0c8c4' into gingerbread-plus-aosp

* commit '7facaf194dfe5b1d2bb2e59dfca355db07d0c8c4':
Import revised translations
7facaf194dfe5b1d2bb2e59dfca355db07d0c8c4 14-Oct-2010 Kenny Root <kroot@google.com> Import revised translations

Change-Id: I71274a01ab66aeecb0d13b8708589a2df49f3403
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
affbd828459349396e000624a90a4ea800a7108b 14-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> am 5eadab02: am 4492b2c6: Fix OPP crash and Call Log sort order.

Merge commit '5eadab02ea3202f417434a13a7637379fffc43de'

* commit '5eadab02ea3202f417434a13a7637379fffc43de':
Fix OPP crash and Call Log sort order.
5eadab02ea3202f417434a13a7637379fffc43de 12-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> am 4492b2c6: Fix OPP crash and Call Log sort order.

Merge commit '4492b2c66cf3b26fd988f3b7f1f5df6cc9ed49f2' into gingerbread-plus-aosp

* commit '4492b2c66cf3b26fd988f3b7f1f5df6cc9ed49f2':
Fix OPP crash and Call Log sort order.
4492b2c66cf3b26fd988f3b7f1f5df6cc9ed49f2 12-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> Fix OPP crash and Call Log sort order.

Bug: 3067780 3067770
Dr No: jerry

Change-Id: I2ac39e2f1f0233a6ada84af39d8addfe0fe04cea
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
99c41899699fef2cea41cb227003eeda851f93ad 11-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> am c47e9733: am 3f475149: Merge "Make "search by number" function work" into gingerbread

Merge commit 'c47e9733b12c81b24ec32f0707f2cd5288aaf6b0'

* commit 'c47e9733b12c81b24ec32f0707f2cd5288aaf6b0':
Make "search by number" function work
970054c28da68ffdaeef1b7058a792edd3b69a25 10-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> am 0b1672a9: am e298302a: Merge "Add intent filter to PBAP service." into gingerbread

Merge commit '0b1672a98621c794363dddc2a1b61a854de98ded'

* commit '0b1672a98621c794363dddc2a1b61a854de98ded':
Add intent filter to PBAP service.
c47e9733b12c81b24ec32f0707f2cd5288aaf6b0 10-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> am 3f475149: Merge "Make "search by number" function work" into gingerbread

Merge commit '3f475149a4c74ccce703cab676283ab4355dc3c6' into gingerbread-plus-aosp

* commit '3f475149a4c74ccce703cab676283ab4355dc3c6':
Make "search by number" function work
3f475149a4c74ccce703cab676283ab4355dc3c6 10-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Make "search by number" function work" into gingerbread
0b1672a98621c794363dddc2a1b61a854de98ded 08-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> am e298302a: Merge "Add intent filter to PBAP service." into gingerbread

Merge commit 'e298302a02408a2440fac8a7e84f8b8403c99371' into gingerbread-plus-aosp

* commit 'e298302a02408a2440fac8a7e84f8b8403c99371':
Add intent filter to PBAP service.
e298302a02408a2440fac8a7e84f8b8403c99371 08-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Add intent filter to PBAP service." into gingerbread
8fb1d457e213dfa7b4f2f7057a7d7340a1db972c 07-Oct-2010 Nick Pelly <npelly@google.com> am a6a28724: am 82d9bdb1: Merge "Don\'t enforce Authenticated Link key (MITM protection) on PBAP." into gingerbread

Merge commit 'a6a28724002f61ad69d240192e3886be11a61693'

* commit 'a6a28724002f61ad69d240192e3886be11a61693':
Don't enforce Authenticated Link key (MITM protection) on PBAP.
0dcd2262d853c2011e11617a8efba6758370c41f 05-Oct-2010 Liejun Tao <L.J.Tao@motorola.com> Make "search by number" function work

Previous "search by number" is wrong. Re-implement it to make it work.
Add flexible to handle searchValue as both null-terminated and not
null-terminated.

Change-Id: Ie50f8d29dfcbae868c43d482467b09b08ed2be0f
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
b8c66039d19c695ee6e01699a0b6b4411b1595b5 07-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> Add intent filter to PBAP service.

Change-Id: I4059c74fcd6622c0e5688ffa171ff5d1f3be6b8f
ndroidManifest.xml
a6a28724002f61ad69d240192e3886be11a61693 06-Oct-2010 Nick Pelly <npelly@google.com> am 82d9bdb1: Merge "Don\'t enforce Authenticated Link key (MITM protection) on PBAP." into gingerbread

Merge commit '82d9bdb117558939d975ca996522f881b0985a68' into gingerbread-plus-aosp

* commit '82d9bdb117558939d975ca996522f881b0985a68':
Don't enforce Authenticated Link key (MITM protection) on PBAP.
82d9bdb117558939d975ca996522f881b0985a68 06-Oct-2010 Nick Pelly <npelly@google.com> Merge "Don't enforce Authenticated Link key (MITM protection) on PBAP." into gingerbread
4fbc7412b96934831ce29a7af54b170056f8c2de 04-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> Don't enforce Authenticated Link key (MITM protection) on PBAP.

Gory Details:
SecureRfcomm API => authentication is true and encyrption is true. (HIGH)
InSecureRfcomm API => authentication is false and encryption is true. (MEDIUM)
The authentication above refers to the authentication of the link
key i.e prevention of MITM attacks.
Bluetooth 2.0 legacy pairing doesn't provide MITM protection.

Bluetooth 2.1 -> If pairing is done with MITM protection already,
this doesn't matter. If pairing is NOT done with MITM protection
we have the same security as the other core profiles. It dones't make
sense to enfore MITM for this profile while having Handsfree profile
to not have MITM i.e some attacker can listen in on conversations.

Why are we changing this now: More headsets with 2.1 and No Input/Output
have started to support PBAP. So we pair without MITM with them and then
when the PBAP request comes it fails because we need MITM protection and
we try to exchange keys (i.e pair again)
The headset don't allow pairing to happen at any time because its a security
issue and hence PBAP request fails.

Change-Id: Ia80c15c545e9396e7c6882b731c90a8ede119827
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
90267811dbb82be8b3f7a70af7f493ab7a9698b6 04-Oct-2010 Gilles Debunne <debunne@google.com> am 10d6ff44: am 0ca9e88b: New bluetooth folder icons. Bug 3040343

Merge commit '10d6ff4485dc267f98b1f60fe13f79ed98b2c7b4'

* commit '10d6ff4485dc267f98b1f60fe13f79ed98b2c7b4':
New bluetooth folder icons. Bug 3040343
10d6ff4485dc267f98b1f60fe13f79ed98b2c7b4 04-Oct-2010 Gilles Debunne <debunne@google.com> am 0ca9e88b: New bluetooth folder icons. Bug 3040343

Merge commit '0ca9e88b03dd34a1bbf63a218d34a7449ff2635b' into gingerbread-plus-aosp

* commit '0ca9e88b03dd34a1bbf63a218d34a7449ff2635b':
New bluetooth folder icons. Bug 3040343
0ca9e88b03dd34a1bbf63a218d34a7449ff2635b 04-Oct-2010 Gilles Debunne <debunne@google.com> New bluetooth folder icons. Bug 3040343

Change-Id: I4d89a58a5180a150635768e3d46a38ed61d96f51
es/drawable-hdpi/bt_incomming_file_notification.png
es/drawable-hdpi/ic_launcher_folder_bluetooth.png
es/drawable-mdpi/ic_launcher_folder_bluetooth.png
e1d990686356cabe6a252901b171a4569193ad73 04-Oct-2010 Ola Johnsson <ola.johnsson@sonyericsson.com> am 20d24a75: am 4ce32fcc: PullvCardList implemented according to specification

Merge commit '20d24a75ff0111a86418d77fdd98dd2e7ef4a0ca'

* commit '20d24a75ff0111a86418d77fdd98dd2e7ef4a0ca':
PullvCardList implemented according to specification
20d24a75ff0111a86418d77fdd98dd2e7ef4a0ca 04-Oct-2010 Ola Johnsson <ola.johnsson@sonyericsson.com> am 4ce32fcc: PullvCardList implemented according to specification

Merge commit '4ce32fccf381a3b448f0d5ff56665201c0e0e6d3' into gingerbread-plus-aosp

* commit '4ce32fccf381a3b448f0d5ff56665201c0e0e6d3':
PullvCardList implemented according to specification
4ce32fccf381a3b448f0d5ff56665201c0e0e6d3 16-Jun-2010 Ola Johnsson <ola.johnsson@sonyericsson.com> PullvCardList implemented according to specification

The value tag sent as a byte array was not parsed correctly
leading to illegal strings. The list count value was not used
according to the specification, now refers to number of entries
that should be returned. Specification for Phone book access
profile chapter 5.3 default max list size of OxFFFF (65535)
taken from 5.3.4.4. Now uses default values when Application
Parameter headers are missing.

Change-Id: Ib17f2208a91b4f896d9beebaf3a21566502ac291
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
26611c8694502afa2161004f51f0f409c08675d3 01-Oct-2010 Eric Fischer <enf@google.com> am 7b560f1c: (-s ours) am 34760a31: Import revised translations. DO NOT MERGE

Merge commit '7b560f1cc7e7661ed4ee3f2056346c336fa43fe4'

* commit '7b560f1cc7e7661ed4ee3f2056346c336fa43fe4':
Import revised translations. DO NOT MERGE
7b560f1cc7e7661ed4ee3f2056346c336fa43fe4 01-Oct-2010 Eric Fischer <enf@google.com> am 34760a31: Import revised translations. DO NOT MERGE

Merge commit '34760a3117ff3fe4f1e8fe80c9367bcc7390c2b6' into gingerbread-plus-aosp

* commit '34760a3117ff3fe4f1e8fe80c9367bcc7390c2b6':
Import revised translations. DO NOT MERGE
1b715132e3f7a20c1877550e4ea6bbb3469c3de7 30-Sep-2010 Eric Fischer <enf@google.com> am c9c801a4: am a26109b2: Merge "Split strings with SD card references into variations." into gingerbread

Merge commit 'c9c801a48baeed7b5af85e88b69e02444dafabe5'

* commit 'c9c801a48baeed7b5af85e88b69e02444dafabe5':
Split strings with SD card references into variations.
34760a3117ff3fe4f1e8fe80c9367bcc7390c2b6 29-Sep-2010 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I0f5729fa9041ac4ba030b939b899f66d0952d1c6
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
c9c801a48baeed7b5af85e88b69e02444dafabe5 29-Sep-2010 Eric Fischer <enf@google.com> am a26109b2: Merge "Split strings with SD card references into variations." into gingerbread

Merge commit 'a26109b280f2967514454a9b99522faeb35f580f' into gingerbread-plus-aosp

* commit 'a26109b280f2967514454a9b99522faeb35f580f':
Split strings with SD card references into variations.
a26109b280f2967514454a9b99522faeb35f580f 29-Sep-2010 Eric Fischer <enf@google.com> Merge "Split strings with SD card references into variations." into gingerbread
7a93f67e130cd9d0972d4f1346c8bcf3250e687e 29-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> am 8b08754f: am 5f78d4ef: Merge "Update BT folder icon." into gingerbread

Merge commit '8b08754fe9d87d6f6f3b19b81330622889ac8264'

* commit '8b08754fe9d87d6f6f3b19b81330622889ac8264':
Update BT folder icon.
8b08754fe9d87d6f6f3b19b81330622889ac8264 29-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> am 5f78d4ef: Merge "Update BT folder icon." into gingerbread

Merge commit '5f78d4ef75710e3dbf608644b16da7c6f88d00ed' into gingerbread-plus-aosp

* commit '5f78d4ef75710e3dbf608644b16da7c6f88d00ed':
Update BT folder icon.
5f78d4ef75710e3dbf608644b16da7c6f88d00ed 29-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Update BT folder icon." into gingerbread
5b09b7148807c3f864da0a671141f2a2379445b2 29-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> Update BT folder icon.

Change-Id: I1aecca20d4a9aaaf8e4aad37eb5c2e2357fad6ad
rc/com/android/bluetooth/opp/BluetoothOppLiveFolder.java
fd37140cf142580685b06006c352690902292137 29-Sep-2010 Eric Fischer <enf@google.com> Split strings with SD card references into variations.

Change-Id: Ie01f4de45b427f06b0daec3847b865d0e4b2d6e7
es/values/strings.xml
3fba9e8d40649b06fe1f4f7d99f4655e9e2500fe 28-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am c24d5e25: am 0a79bdbb: Trim the Bluetooth database off the main thread.

Merge commit 'c24d5e2584346d02fe6a6cabae2ada4cf3e04ee1'

* commit 'c24d5e2584346d02fe6a6cabae2ada4cf3e04ee1':
Trim the Bluetooth database off the main thread.
c24d5e2584346d02fe6a6cabae2ada4cf3e04ee1 28-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am 0a79bdbb: Trim the Bluetooth database off the main thread.

Merge commit '0a79bdbbfa3b79b808cbbe7490731e5aae4489e9' into gingerbread-plus-aosp

* commit '0a79bdbbfa3b79b808cbbe7490731e5aae4489e9':
Trim the Bluetooth database off the main thread.
0a79bdbbfa3b79b808cbbe7490731e5aae4489e9 28-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> Trim the Bluetooth database off the main thread.

This looks to be most if not all of the remaining StrictMode
violations in this process. Not a huge deal, but cleaning up noise
will make bigger problems stand out easier in the future.

Change-Id: I262194c12114114fbe059d73475afb1bbb5654ab
rc/com/android/bluetooth/opp/BluetoothOppService.java
e5a833ce8ab4ec3e09308c7ef88a7f956ee39c45 27-Sep-2010 Eric Fischer <enf@google.com> am e1a84b31: (-s ours) am d50b3d13: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread

Merge commit 'e1a84b31d5945c4690b25d3c86ee82bfa9278bb8'

* commit 'e1a84b31d5945c4690b25d3c86ee82bfa9278bb8':
Trim unwanted whitespace from translations. DO NOT MERGE
e1a84b31d5945c4690b25d3c86ee82bfa9278bb8 27-Sep-2010 Eric Fischer <enf@google.com> am d50b3d13: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread

Merge commit 'd50b3d1388577370cfe61c34b238cb6c245667a8' into gingerbread-plus-aosp

* commit 'd50b3d1388577370cfe61c34b238cb6c245667a8':
Trim unwanted whitespace from translations. DO NOT MERGE
d50b3d1388577370cfe61c34b238cb6c245667a8 27-Sep-2010 Eric Fischer <enf@google.com> Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
b4addfca5f3da53e373948b4e2aaf69959e5c7c3 27-Sep-2010 Eric Fischer <enf@google.com> Trim unwanted whitespace from translations. DO NOT MERGE

Change-Id: I22c96b9e3540bd220c01987a0830c3e6b2420e29
es/values-pt-rPT/strings.xml
003736851fb837c783db7ee2ae8f80b0fc836b5c 27-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am f7394446: (-s ours) am 58ffcb38: reconcile froyo-release into gingerbread

Merge commit 'f739444694a8378142250f930bc575f9628d7ace'

* commit 'f739444694a8378142250f930bc575f9628d7ace':
Fix string placeholders that got mangled in translation. DO NOT MERGE
f739444694a8378142250f930bc575f9628d7ace 27-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 58ffcb38: reconcile froyo-release into gingerbread

Merge commit '58ffcb38828199b04a756e93a525779554efd9c9' into gingerbread-plus-aosp

* commit '58ffcb38828199b04a756e93a525779554efd9c9':
Fix string placeholders that got mangled in translation. DO NOT MERGE
58ffcb38828199b04a756e93a525779554efd9c9 27-Sep-2010 Jean-Baptiste Queru <jbq@google.com> reconcile froyo-release into gingerbread

Change-Id: I5b2492a62bab246a41ad43f45f7a1d4c13b15985
453050fdaf7dcd488f399d3549ce257e7b9e7e79 17-May-2010 Wojciech Jowsa <wojciech.jowsa@stericsson.com> BT - Not possible to accept incoming obex transfers using key-presses.

It is not possible to accept/reject an incoming obex file transfer
using key-press. Only touch screen press was working.

With this fix, key press down is not ignored and it is possible
to accept/reject an incoming obex file transfer with key-press.

ST-Ericsson Change ID: ER260817
Change-Id: Ic7f668bd1b0efa549d0218edc8719efee1984941

Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
rc/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
6dfc94e0b2a57f95432dd2dd4e505f7d80f6b594 22-Sep-2010 a5206c <a5206c@motorola.com> am 541939ff: am 77b122f5: For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT

Merge commit '541939ff48867b2a8656503d29f29eb6bf6f1a30'

* commit '541939ff48867b2a8656503d29f29eb6bf6f1a30':
For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT
541939ff48867b2a8656503d29f29eb6bf6f1a30 22-Sep-2010 a5206c <a5206c@motorola.com> am 77b122f5: For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT

Merge commit '77b122f551ae37811c75ae76fa2029f7b3f2f404' into gingerbread-plus-aosp

* commit '77b122f551ae37811c75ae76fa2029f7b3f2f404':
For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT
77b122f551ae37811c75ae76fa2029f7b3f2f404 22-Sep-2010 a5206c <a5206c@motorola.com> For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
480d3b1324d58432d7c9da914debfaca3e8529c9 09-Sep-2010 Eric Fischer <enf@google.com> Fix string placeholders that got mangled in translation. DO NOT MERGE

Pull the new versions of the three affected strings back from gingerbread
(where the placeholders are explicitly marked as such) and reimport the
zh-rTW translations.

Change-Id: Ica839e87d3efe32f5cc8ae0ab42346d8f60d3015
es/values-zh-rTW/strings.xml
es/values/strings.xml
f3d6b25c0ea3b2bcd01ab457967c7b40ccd20b5b 13-Sep-2010 Daisuke Miyakawa <dmiyakawa@google.com> Let BT use FLAG_REFRAIN_IMAGE_EXPORT.

Bug: 2603200
Change-Id: I385e831b8c5684cc75c249ee6d41d5256a29f3c5
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
5550a5a6e804f9b9fcc9080f7fdf0d5416cd0725 10-Sep-2010 Eric Fischer <enf@google.com> am 0aabafe3: (-s ours) am 037bb6c9: am bf992c5b: (-s ours) Fix string placeholders that got mangled in translation. DO NOT MERGE

Merge commit '0aabafe3bb8c8d1de6dfbc8b54509aac02f91a4e'

* commit '0aabafe3bb8c8d1de6dfbc8b54509aac02f91a4e':
Fix string placeholders that got mangled in translation. DO NOT MERGE
0aabafe3bb8c8d1de6dfbc8b54509aac02f91a4e 10-Sep-2010 Eric Fischer <enf@google.com> am 037bb6c9: am bf992c5b: (-s ours) Fix string placeholders that got mangled in translation. DO NOT MERGE

Merge commit '037bb6c989f4bbce24585abcca790fdc3115ff14' into gingerbread-plus-aosp

* commit '037bb6c989f4bbce24585abcca790fdc3115ff14':
Fix string placeholders that got mangled in translation. DO NOT MERGE
037bb6c989f4bbce24585abcca790fdc3115ff14 10-Sep-2010 Eric Fischer <enf@google.com> am bf992c5b: (-s ours) Fix string placeholders that got mangled in translation. DO NOT MERGE

Merge commit 'bf992c5b8417c41779e6cb5890b65949dc3353bf' into gingerbread

* commit 'bf992c5b8417c41779e6cb5890b65949dc3353bf':
Fix string placeholders that got mangled in translation. DO NOT MERGE
bf992c5b8417c41779e6cb5890b65949dc3353bf 09-Sep-2010 Eric Fischer <enf@google.com> Fix string placeholders that got mangled in translation. DO NOT MERGE

Pull the new versions of the three affected strings back from gingerbread
(where the placeholders are explicitly marked as such) and reimport the
zh-rTW translations.

Change-Id: Ica839e87d3efe32f5cc8ae0ab42346d8f60d3015
es/values-zh-rTW/strings.xml
es/values/strings.xml
0fd720422f69837c3c121c2debeac71794d27e30 03-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am d4693ca9: am 55470710: Replace use of SharedPreference commit() with apply().

Merge commit 'd4693ca99284a12703a0de9fd6c70f50262073e0'

* commit 'd4693ca99284a12703a0de9fd6c70f50262073e0':
Replace use of SharedPreference commit() with apply().
d4693ca99284a12703a0de9fd6c70f50262073e0 03-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am 55470710: Replace use of SharedPreference commit() with apply().

Merge commit '55470710c2624bde2aa56275d29b60055638c06c' into gingerbread-plus-aosp

* commit '55470710c2624bde2aa56275d29b60055638c06c':
Replace use of SharedPreference commit() with apply().
55470710c2624bde2aa56275d29b60055638c06c 03-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> Replace use of SharedPreference commit() with apply().

Also fix a typo and replace a bunch of redundant
SharedPreference.Editor commits with one at the end.

Change-Id: I75623cb6809a363d05421f80f1560d586ae1ab80
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppPreference.java
88ddb47358ada889c1bf01ff2a3dc690f2b2b78d 02-Sep-2010 Daisuke Miyakawa <dmiyakawa@google.com> am 6a962312: am 0ddb8aab: Modify variables used in vCard code.

Merge commit '6a962312358451fbb3c77ff7f6048388178f5677'

* commit '6a962312358451fbb3c77ff7f6048388178f5677':
Modify variables used in vCard code.
6a962312358451fbb3c77ff7f6048388178f5677 02-Sep-2010 Daisuke Miyakawa <dmiyakawa@google.com> am 0ddb8aab: Modify variables used in vCard code.

Merge commit '0ddb8aabe0f62d7741ee0aa040e43643b823c441' into gingerbread-plus-aosp

* commit '0ddb8aabe0f62d7741ee0aa040e43643b823c441':
Modify variables used in vCard code.
0ddb8aabe0f62d7741ee0aa040e43643b823c441 02-Sep-2010 Daisuke Miyakawa <dmiyakawa@google.com> Modify variables used in vCard code.

See also Icf265ce7f83c1e2bd5db0c3d9bd4c142afd6db34

Change-Id: I3a94e86d0788a395ac0744bdf6e31c8e64fb0c15
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
e699ee4ed89f2d33c7566a57b3ebebb3df12e5aa 30-Aug-2010 Edward Savage-Jones <edward.savage-jones@sonyericsson.com> am f6856304: am b8c5dba8: Send vCard with Unicode encoded Strings over BT

Merge commit 'f6856304763652829df07acf688b77714d4eb5c6'

* commit 'f6856304763652829df07acf688b77714d4eb5c6':
Send vCard with Unicode encoded Strings over BT
addc5ca6de80b9956faf7b3fff9815a4ccde8e93 30-Aug-2010 Jaikumar Ganesh <jaikumar@google.com> am 44fbf5a3: am 8e658ce5: Merge "Send vCard with Unicode encoded Strings over BT" into gingerbread

Merge commit '44fbf5a3537d1d701eedbd85e7115c36ef851c58'

* commit '44fbf5a3537d1d701eedbd85e7115c36ef851c58':
Send vCard with Unicode encoded Strings over BT
905e52e483ea331873480d215c12220e53d1da39 30-Aug-2010 Eric Fischer <enf@google.com> am 273db609: (-s ours) am 6bbc1370: Import revised translations. DO NOT MERGE

Merge commit '273db609e2f6deb8449be3256e3d75e8ad2a15a5'

* commit '273db609e2f6deb8449be3256e3d75e8ad2a15a5':
Import revised translations. DO NOT MERGE
f6856304763652829df07acf688b77714d4eb5c6 30-Aug-2010 Edward Savage-Jones <edward.savage-jones@sonyericsson.com> am b8c5dba8: Send vCard with Unicode encoded Strings over BT

Merge commit 'b8c5dba8b3e9a46873b8568d5cbead6d7390f96b' into gingerbread-plus-aosp

* commit 'b8c5dba8b3e9a46873b8568d5cbead6d7390f96b':
Send vCard with Unicode encoded Strings over BT
44fbf5a3537d1d701eedbd85e7115c36ef851c58 30-Aug-2010 Jaikumar Ganesh <jaikumar@google.com> am 8e658ce5: Merge "Send vCard with Unicode encoded Strings over BT" into gingerbread

Merge commit '8e658ce507d2525616ca27aa7135032eee9a5e75' into gingerbread-plus-aosp

* commit '8e658ce507d2525616ca27aa7135032eee9a5e75':
Send vCard with Unicode encoded Strings over BT
273db609e2f6deb8449be3256e3d75e8ad2a15a5 30-Aug-2010 Eric Fischer <enf@google.com> am 6bbc1370: Import revised translations. DO NOT MERGE

Merge commit '6bbc13705ca8a9798607a63f2f251e0f992885b7' into gingerbread-plus-aosp

* commit '6bbc13705ca8a9798607a63f2f251e0f992885b7':
Import revised translations. DO NOT MERGE
8e658ce507d2525616ca27aa7135032eee9a5e75 30-Aug-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Send vCard with Unicode encoded Strings over BT" into gingerbread
f890b9395afee07aef2ae93e1213819919bc5e9f 27-Aug-2010 Edward Savage-Jones <edward.savage-jones@sonyericsson.com> Send vCard with Unicode encoded Strings over BT

The standard Android code doesn't correctly handle creation of byte
packets when sending vCard data. The length of a String is used to
specify the number of bytes being sent, which works if all
characters are ASCII (1 byte per char), but if Unicode characters
exist within the string, then bytes vs String length differ which
causes a truncation of the vCard during Bluetooth send.

Change-Id: Ic39dd53a38f1f353523c625940b0317b00e86d4f
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
6bbc13705ca8a9798607a63f2f251e0f992885b7 28-Aug-2010 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I6059c994c650c5e581a8e953616aaf3941b5afb1
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
b8c5dba8b3e9a46873b8568d5cbead6d7390f96b 27-Aug-2010 Edward Savage-Jones <edward.savage-jones@sonyericsson.com> Send vCard with Unicode encoded Strings over BT

The standard Android code doesn't correctly handle creation of byte
packets when sending vCard data. The length of a String is used to
specify the number of bytes being sent, which works if all
characters are ASCII (1 byte per char), but if Unicode characters
exist within the string, then bytes vs String length differ which
causes a truncation of the vCard during Bluetooth send.

Change-Id: Ic39dd53a38f1f353523c625940b0317b00e86d4f
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
6aad2f80e2caa7f26cee24e04a3defd2da976665 18-Aug-2010 Jaikumar Ganesh <jaikumar@google.com> am 553ced65: (-s ours) am 4a27976f: Merge "Add tags around string formatting placeholders. DO NOT MERGE" into gingerbread

Merge commit '553ced659c99dbba81c1d5ab3ab1c176920d84b7'

* commit '553ced659c99dbba81c1d5ab3ab1c176920d84b7':
Add tags around string formatting placeholders. DO NOT MERGE
ed11a21831c0005af092d856a8a1631fbfb98b2b 18-Aug-2010 Eric Fischer <enf@google.com> am 0193c6ac: (-s ours) am 98a1288a: Import revised translations. DO NOT MERGE

Merge commit '0193c6ac625e7abc14ebd625c0d6992aff54c71f'

* commit '0193c6ac625e7abc14ebd625c0d6992aff54c71f':
Import revised translations. DO NOT MERGE
553ced659c99dbba81c1d5ab3ab1c176920d84b7 18-Aug-2010 Jaikumar Ganesh <jaikumar@google.com> am 4a27976f: Merge "Add tags around string formatting placeholders. DO NOT MERGE" into gingerbread

Merge commit '4a27976f0c876e4159bec9dbf3fed0eb49bf60ed' into gingerbread-plus-aosp

* commit '4a27976f0c876e4159bec9dbf3fed0eb49bf60ed':
Add tags around string formatting placeholders. DO NOT MERGE
0193c6ac625e7abc14ebd625c0d6992aff54c71f 18-Aug-2010 Eric Fischer <enf@google.com> am 98a1288a: Import revised translations. DO NOT MERGE

Merge commit '98a1288abc737a8dc00d044c0f5ca306bc4b2880' into gingerbread-plus-aosp

* commit '98a1288abc737a8dc00d044c0f5ca306bc4b2880':
Import revised translations. DO NOT MERGE
4a27976f0c876e4159bec9dbf3fed0eb49bf60ed 18-Aug-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Add tags around string formatting placeholders. DO NOT MERGE" into gingerbread
67df447146ff79c7120ced09cd6ac011fe22c017 20-Apr-2010 Eric Fischer <enf@google.com> Add tags around string formatting placeholders. DO NOT MERGE

Make the wording of one error message more idiomatic.

Change-Id: I1a427c8a211bca9b8c5261ceda37edf64ceb556c
es/values/strings.xml
f3cead5db17c8f081f839bbf10a51febf89e5f2b 18-Aug-2010 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I6fd3420efd04353a89f6559a0fbefd95832ed753
es/values-ja/strings.xml
98a1288abc737a8dc00d044c0f5ca306bc4b2880 18-Aug-2010 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: Ic1f84b8846c17593036d8ac09baaeb96a4244c44
es/values-ja/strings.xml
accd7a537cabd7d0a8f83471a4f635a2b44f9c00 11-Aug-2010 Jaikumar Ganesh <jaikumar@google.com> am d5b94fe6: am ff2927dc: Merge "Optimize Opp Notification" into gingerbread

Merge commit 'd5b94fe6cd8144b9c6f0d6de35080f8ca49c601d'

* commit 'd5b94fe6cd8144b9c6f0d6de35080f8ca49c601d':
Optimize Opp Notification
d5b94fe6cd8144b9c6f0d6de35080f8ca49c601d 11-Aug-2010 Jaikumar Ganesh <jaikumar@google.com> am ff2927dc: Merge "Optimize Opp Notification" into gingerbread

Merge commit 'ff2927dcdff66114e56b0636d6b29ac71f62508b' into gingerbread-plus-aosp

* commit 'ff2927dcdff66114e56b0636d6b29ac71f62508b':
Optimize Opp Notification
ff2927dcdff66114e56b0636d6b29ac71f62508b 11-Aug-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Optimize Opp Notification" into gingerbread
eb77c4b1d9aa71d7dd8dd934e9d1971583f9c0e2 03-Aug-2010 Liejun Tao <L.J.Tao@motorola.com> Optimize Opp Notification

Current Opp notification is running too frequently. When file transfer
speed is fast, it could update notification 7-8 times in 1 second.
Use a timer to limit the notification to once per second.

Change-Id: I162033d9e12148260515c8ed318928e4de9a4392
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/BluetoothOppTransferHistory.java
e8d4528e81c6354d94b0de9e903f468a055c1a8c 10-Aug-2010 Eric Fischer <enf@google.com> Merge "Import revised translations."
48f9c7b78dc6ef032ccf552b58d9fb28c0f95884 10-Aug-2010 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I52656d001c3c3454a0a5c54d3bdb29158bad0e98
es/values-de/strings.xml
es/values-el/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
a431b2d5959d9864346f1d67b64614b01e5afad2 10-Aug-2010 Eric Fischer <enf@google.com> am 83f2754c: (-s ours) am 8759d55e: Import revised translations. DO NOT MERGE

Merge commit '83f2754c1812457520880e7fe8f9c02e82bde2e5'

* commit '83f2754c1812457520880e7fe8f9c02e82bde2e5':
Import revised translations. DO NOT MERGE
83f2754c1812457520880e7fe8f9c02e82bde2e5 10-Aug-2010 Eric Fischer <enf@google.com> am 8759d55e: Import revised translations. DO NOT MERGE

Merge commit '8759d55ec0668dec9ca2439085fe314fb0f21d27' into gingerbread-plus-aosp

* commit '8759d55ec0668dec9ca2439085fe314fb0f21d27':
Import revised translations. DO NOT MERGE
8759d55ec0668dec9ca2439085fe314fb0f21d27 10-Aug-2010 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I2df2905587fcb58d7e40677282f0fa3eb27622e4
es/values-de/strings.xml
f43c10313950f25fdfa5b7cf90d2e3eee3ce1567 06-Aug-2010 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I60421ab0e93faf83fcf6e3f6e859ae33e1e452fe
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
784d3e421c0dee3635d9179b37414c7f71768797 05-Aug-2010 Eric Fischer <enf@google.com> am 8f8956aa: (-s ours) am 6c75d2f1: Import revised translations. DO NOT MERGE

Merge commit '8f8956aa724929ad1781f0e922a0b02b17ad4542'

* commit '8f8956aa724929ad1781f0e922a0b02b17ad4542':
Import revised translations. DO NOT MERGE
8f8956aa724929ad1781f0e922a0b02b17ad4542 04-Aug-2010 Eric Fischer <enf@google.com> am 6c75d2f1: Import revised translations. DO NOT MERGE

Merge commit '6c75d2f16e09a66927aad03423ce191f860369d3' into gingerbread-plus-aosp

* commit '6c75d2f16e09a66927aad03423ce191f860369d3':
Import revised translations. DO NOT MERGE
6c75d2f16e09a66927aad03423ce191f860369d3 04-Aug-2010 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I751dea57ff96b08328284c6489acffafab0ebd51
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
b6885cba0539ea82025862394e0dac010a5a8f33 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 587ef795: merge from open-source master

Merge commit '587ef79589b5b453e71f8472baea583390579e20'

* commit '587ef79589b5b453e71f8472baea583390579e20':
PullvCardList implemented according to specification
587ef79589b5b453e71f8472baea583390579e20 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Id325ee50130e50b8080fd3a1e51a4fda8371e4c8
12f500b84c1a635d0ed951c8c586f81b55fb9f6b 16-Jun-2010 Ola Johnsson <ola.johnsson@sonyericsson.com> PullvCardList implemented according to specification

The value tag sent as a byte array was not parsed correctly
leading to illegal strings. The list count value was not used
according to the specification, now refers to number of entries
that should be returned. Specification for Phone book access
profile chapter 5.3 default max list size of OxFFFF (65535)
taken from 5.3.4.4. Now uses default values when Application
Parameter headers are missing.

Change-Id: Ib17f2208a91b4f896d9beebaf3a21566502ac291
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
284bbfbfd18dd6cc33404b9fb58b7b5c164452b8 21-Jun-2010 Kenny Root <kroot@google.com> am 9d19acd1: am 252a2736: Import revised translations

Merge commit '9d19acd16de9757778f65605ba2f75398f4e5a92'

* commit '9d19acd16de9757778f65605ba2f75398f4e5a92':
Import revised translations
9d19acd16de9757778f65605ba2f75398f4e5a92 21-Jun-2010 Kenny Root <kroot@google.com> am 252a2736: Import revised translations

Merge commit '252a273678109302c6c4a3e35306f5fe9ce52738' into gingerbread

* commit '252a273678109302c6c4a3e35306f5fe9ce52738':
Import revised translations
252a273678109302c6c4a3e35306f5fe9ce52738 21-Jun-2010 Kenny Root <kroot@google.com> Import revised translations

Change-Id: Ia0887bd64eafcb3a3ef329b84805a2859cde44eb
es/values-ko/strings.xml
813576d12949ecf13d8050d199ecf18711658242 21-Jun-2010 Kenny Root <kroot@google.com> am 3f7d1cb0: am 25c3b801: Import revised translations

Merge commit '3f7d1cb03bc9bb7ae7bde7ab39e645b3d75765a6'

* commit '3f7d1cb03bc9bb7ae7bde7ab39e645b3d75765a6':
Import revised translations
3f7d1cb03bc9bb7ae7bde7ab39e645b3d75765a6 21-Jun-2010 Kenny Root <kroot@google.com> am 25c3b801: Import revised translations

Merge commit '25c3b801069d8c44854093b3cd1a93ecb9654020' into gingerbread

* commit '25c3b801069d8c44854093b3cd1a93ecb9654020':
Import revised translations
25c3b801069d8c44854093b3cd1a93ecb9654020 21-Jun-2010 Kenny Root <kroot@google.com> Import revised translations

Change-Id: I5351f0f604a561458f284c0e9444d5aec7767733
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
59a9d43a7f921d5aafd131d815570044f9e96f88 10-Jun-2010 Kenny Root <kroot@google.com> am 560c86fc: am 2b72fec0: Import revised translations
560c86fc23b60abffb2ad8511ba19c531adc05a9 10-Jun-2010 Kenny Root <kroot@google.com> am 2b72fec0: Import revised translations

Merge commit '2b72fec02d9094b1fc43694046f44ce511328f86' into kraken

* commit '2b72fec02d9094b1fc43694046f44ce511328f86':
Import revised translations
2b72fec02d9094b1fc43694046f44ce511328f86 10-Jun-2010 Kenny Root <kroot@google.com> Import revised translations

Change-Id: I118b7e54616b1144be81c8e9ea5de04efb388a97
es/values-es-rUS/strings.xml
0d17dc3f5be65452b7998125e22537868bdfa9ed 08-Jun-2010 Jaikumar Ganesh <jaikumar@google.com> am 69b2c318: Merge "Set number as "Unknown" for private numbers." into kraken
69b2c3189f537829ca9412d4cdd1762785411e9c 08-Jun-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Set number as "Unknown" for private numbers." into kraken
00aee7a70e3c76b6c9ef59133d59fcdc592fea99 07-Jun-2010 Jaikumar Ganesh <jaikumar@google.com> Set number as "Unknown" for private numbers.

Change-Id: I54bb9595913c90e72eef659627d95bb63398e84a
es/values/strings.xml
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
aa80a223c5b1c3b3c0225168ae1cbc808300d3cf 03-Jun-2010 Joe Onorato <joeo@android.com> am feb2ae08: This icon shouldn\'t be animated, and that private class is gone.
feb2ae08d0a2e89c31ce782ccd3d377d141fec5c 03-Jun-2010 Joe Onorato <joeo@android.com> This icon shouldn't be animated, and that private class is gone.

Change-Id: I1652c4685c31b55e6519a9180490d86634732d87
es/layout/status_bar_ongoing_event_progress_bar.xml
e018f886c5ab50f0de03446ece64a23d567b12a2 02-Jun-2010 Kenny Root <kroot@google.com> am 669a11be: Fix-up es-419 translation
669a11be8bae358ed8dd9593e01c3dfa3b817f70 28-May-2010 Kenny Root <kroot@google.com> Fix-up es-419 translation

Change-Id: If56b21a216ffa585fa3c1c6134a7fefcd62caa0e
es/values-es-rUS/strings.xml
920ed171213a79b0d9877f4f7ce3a9046bed58a6 28-May-2010 David Yue <a5206c@motorola.com> am 0c21a35d: correct PBAP call log parameters
0c21a35d6d56dd42c97a80e3233df578d0a1cb21 27-May-2010 David Yue <a5206c@motorola.com> correct PBAP call log parameters
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
12cb33f6d9fd269944a5618661e3880beea58b6e 17-May-2010 Daisuke Miyakawa <dmiyakawa@google.com> Use a static version of vCard library.

See also I435e1057.

Bug: 2689523
Change-Id: I6aaa893d13ad2ff66f1439731ef7dbcf079b5011
ndroid.mk
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
964fdffb4402c5e0551ba468cb16d58fdc11e8f4 18-May-2010 Kenny Root <kroot@google.com> am 11100d8f: am 4900671a: Import revised translations
11100d8f0b3a1b0269746254c5c91acaac4f03c8 17-May-2010 Kenny Root <kroot@google.com> am 4900671a: Import revised translations

Merge commit '4900671aa3d9329c8065c7da4e5ae544ed85b9e2' into kraken

* commit '4900671aa3d9329c8065c7da4e5ae544ed85b9e2':
Import revised translations
4900671aa3d9329c8065c7da4e5ae544ed85b9e2 17-May-2010 Kenny Root <kroot@google.com> Import revised translations

Change-Id: Ic96221d5e692ef4089ef4db39bcfedc392e6d321
es/values-de/strings.xml
9aa0830b05f61a527f86280c0dab217702a7648f 17-May-2010 Jaikumar Ganesh <jaikumar@google.com> am 3246a9f0: am 6a148f10: Run Bluetooth Opp activities in the phone process.
48aed9fc24daeac2deca4cd2bd3ce8cf8bfc0d9c 17-May-2010 android-build SharedAccount <android-build@google.com> Merge commit 'ff55fbfa8cf30fe8a72e1a68420cd744ce957' with -s ours.
Original merge was done manually.

Change-Id: I4d5a02b052e356b26d04204dc7e96730d0990720
3246a9f044745a06ab877124c399a97067475ec1 15-May-2010 Jaikumar Ganesh <jaikumar@google.com> am 6a148f10: Run Bluetooth Opp activities in the phone process.

Merge commit '6a148f10d0e26eef9f94e08ac3f1897ce8983bfa' into kraken

* commit '6a148f10d0e26eef9f94e08ac3f1897ce8983bfa':
Run Bluetooth Opp activities in the phone process.
6a148f10d0e26eef9f94e08ac3f1897ce8983bfa 15-May-2010 Jaikumar Ganesh <jaikumar@google.com> Run Bluetooth Opp activities in the phone process.

There were just too much shared code between the classes - we
cannot have them in 2 different process - it can work sometimes and
will fail sometimes depending on the ordering of processes.
Rework involves a lot of code change at this point of time.

Bug: 2684281
Change-Id: I76784650c5f635c1e961392b682c1d33fc2f343f
ndroidManifest.xml
ndroidManifest_test.xml
f7df7a88230c525e2973ca5603f54a77fe47445d 13-May-2010 Jaikumar Ganesh <jaikumar@google.com> Use FLAG_REFRAIN_PHONE_NUMBER_FORMATTING to prevent discard
of "+", "p", "w" etc in phone numbers.

Change-Id: I20aa8d697925ac68dbfd9dc997dcf66fc0d7f5d8
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
ff55fbfa8cf30fe8a72e1a68420cd744ce957828 15-Apr-2010 Daisuke Miyakawa <dmiyakawa@google.com> Use FLAG_REFRAIN_PHONE_NUMBER_FORMATTING to prevent discard
of "+", "p", "w" etc in phone numbers.

Change-Id: Ic69d60e5831e59a497c523aa62c753922edf06f6
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
a988a391b2093fd2f9a50bde63177fe8a416da96 12-May-2010 David Yue <a5206c@motorola.com> am 00cd32b6: am b7533e86: Add missing moveToNext() calling.
00cd32b6c83164f942149613c03e41d7cd61a9fb 12-May-2010 David Yue <a5206c@motorola.com> am b7533e86: Add missing moveToNext() calling.

Merge commit 'b7533e86bb84a2f95c2cff62c1565a8e1696d1ea' into kraken

* commit 'b7533e86bb84a2f95c2cff62c1565a8e1696d1ea':
Add missing moveToNext() calling.
b7533e86bb84a2f95c2cff62c1565a8e1696d1ea 11-May-2010 David Yue <a5206c@motorola.com> Add missing moveToNext() calling.

Bug: 2674275
Change-Id: Ib5f5d2ebe3ff6ab02e43df38097a89541e132b55
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
b754e49db1753161dab1fe32e417101bcfabc9aa 05-May-2010 Lixin Yue <L.X.YUE@motorola.com> am 1d222264: Fix the %1 bug in UI when sdcard full
1d2222642c372e5635a906b6d6620ac35a304cf9 16-Apr-2010 Lixin Yue <L.X.YUE@motorola.com> Fix the %1 bug in UI when sdcard full
rc/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
rc/com/android/bluetooth/opp/BluetoothOppTransferAdapter.java
rc/com/android/bluetooth/opp/BluetoothOppUtility.java
289d4e1466b41644c2da872a8191176e787a5477 28-Apr-2010 Kenny Root <kroot@google.com> am 5dca0a3c: Import revised translations
5dca0a3cb47d2349b07956bbba62642717bc577d 27-Apr-2010 Kenny Root <kroot@google.com> Import revised translations

Change-Id: I70a15978fd77c45efd8a4e6478c98ee953c49a99
es/values-fr/strings.xml
es/values-ko/strings.xml
cf830e71d647d816c4110ff2f820799f8eab928f 23-Apr-2010 Eric Fischer <enf@google.com> Merge "Add tags around string formatting placeholders."
b8292c30db4454eaafe404d923572d0e48596b7f 20-Apr-2010 Eric Fischer <enf@google.com> Add tags around string formatting placeholders.

Make the wording of one error message more idiomatic.

Change-Id: Ibb59089ee894dbc65cc1ec8e62c0dc33118c51f4
es/values/strings.xml
0894f16289755e5d3e81e0d8c1c8097179aeb7f7 20-Apr-2010 Daisuke Miyakawa <dmiyakawa@google.com> Remove wrong merge.

Change-Id: I94ff5633226d37fcc2df39fdcb7ad313a523d435
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
a7b31bac7cbea0382a14d7dcd22a01c3af370b54 20-Apr-2010 Daisuke Miyakawa <dmiyakawa@google.com> am 96ae98f9: Make BluetoothPbapCallLogComposer use FLAG_REFRAIN_IMAGE_EXPORT.
96ae98f996c5809bb34156b85bfc9e3d01008246 20-Apr-2010 Daisuke Miyakawa <dmiyakawa@google.com> Make BluetoothPbapCallLogComposer use FLAG_REFRAIN_IMAGE_EXPORT.

Bug: 2603200
Change-Id: Ie6a40c12fafac5927b616f31a8335df0181f9e18
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
e05d3a710c592db386b55a265a1e657b0467e49f 16-Apr-2010 Daisuke Miyakawa <dmiyakawa@google.com> Make BT new structure.

Change-Id: If1400731a1ba9a91d493ca96f2cc0364ef9b5b18
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
ec6f2d44491bf1e3ffa7c75875985f9c16cf721d 26-Mar-2010 Lixin Yue <L.X.YUE@motorola.com> Clear notifications when the user presses clear from the notifications bar.

Bug: 2542260
Change-Id: I00f9d8216d70543b93cfbcdb2cd8da8331044d77
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/Constants.java
0bd5f7b5c36a60687ffe895368fd8df6df38acab 24-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Fix pbap and opp running bluetooth in phone process problems.

1. Use the right context instead of application context.
2. Make PbapActivity run in the same process as PbapService as they
share state.

Change-Id: Ib50c63c271dd8b30108f22734c47ee8645cd4839
ndroidManifest.xml
ndroidManifest_test.xml
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppPreference.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
20b5a93b6e18cd441065edfdf676ad612affc507 18-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Fix Typo.

Change-Id: Ia71a5b3bb970463132b2c25b90cf3897fc227fb9
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
7b0dbafb310175a465c8d06c44b748c1344d1d86 18-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Add ABORT request handling to PBAP"
948d2c718da2c86c33e01ad8bef8493534c5b57b 18-Mar-2010 Kenny Root <kroot@google.com> Import revised translations

Change-Id: Ia703afd0c3fd603a68f606b684bdf76cd2de32fe
es/values-cs/strings.xml
es/values-cs/strings_pbap.xml
es/values-cs/test_strings.xml
es/values-da/strings.xml
es/values-da/strings_pbap.xml
es/values-da/test_strings.xml
es/values-de/strings.xml
es/values-de/strings_pbap.xml
es/values-de/test_strings.xml
es/values-el/strings.xml
es/values-el/strings_pbap.xml
es/values-el/test_strings.xml
es/values-es-rUS/strings.xml
es/values-es-rUS/strings_pbap.xml
es/values-es-rUS/test_strings.xml
es/values-es/strings.xml
es/values-es/strings_pbap.xml
es/values-es/test_strings.xml
es/values-fr/strings.xml
es/values-fr/strings_pbap.xml
es/values-fr/test_strings.xml
es/values-it/strings.xml
es/values-it/strings_pbap.xml
es/values-it/test_strings.xml
es/values-ja/strings.xml
es/values-ja/strings_pbap.xml
es/values-ja/test_strings.xml
es/values-ko/strings.xml
es/values-ko/strings_pbap.xml
es/values-ko/test_strings.xml
es/values-nb/strings.xml
es/values-nb/strings_pbap.xml
es/values-nb/test_strings.xml
es/values-nl/strings.xml
es/values-nl/strings_pbap.xml
es/values-nl/test_strings.xml
es/values-pl/strings.xml
es/values-pl/strings_pbap.xml
es/values-pl/test_strings.xml
es/values-pt-rPT/strings.xml
es/values-pt-rPT/strings_pbap.xml
es/values-pt-rPT/test_strings.xml
es/values-pt/strings.xml
es/values-pt/strings_pbap.xml
es/values-pt/test_strings.xml
es/values-ru/strings.xml
es/values-ru/strings_pbap.xml
es/values-ru/test_strings.xml
es/values-sv/strings.xml
es/values-sv/strings_pbap.xml
es/values-sv/test_strings.xml
es/values-tr/strings.xml
es/values-tr/strings_pbap.xml
es/values-tr/test_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rCN/strings_pbap.xml
es/values-zh-rCN/test_strings.xml
es/values-zh-rTW/strings.xml
es/values-zh-rTW/strings_pbap.xml
es/values-zh-rTW/test_strings.xml
es/values/strings.xml
20b763a34d1910640084db197be6b458b5b62484 11-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Add ability to run Bluetooth application in a different process if needed.

Change-Id: I5fa328f2b8fd78986b9a1958e5899feca254f316
ndroid.mk
ndroidManifest.xml
ndroidManifest_test.xml
es/values/strings.xml
2cd80b69baa6c96f1ab759fb45cd98e2cbc5f845 18-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Enhanced support to OPP content share"
151f41949621e082e127fe468bedd28289bc3a19 12-Mar-2010 Lixin Yue <L.X.YUE@motorola.com> Enhanced support to OPP content share

Add support to Browser link share via BT;
Add support to share files via BT in 3rd party file manager;

Change-Id: I9a93eb0891d0f670109afd44ab4064f7f15b01f3
es/values/strings.xml
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
rc/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
60c43926b63509fa0607fc671e6fd91106d4a827 17-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Update notification in Transfer history manually when BT if off"
75fc857d22de0ec22e082bddb720d8465c9e3552 12-Mar-2010 Lixin Yue <L.X.YUE@motorola.com> optimize deleting operation in trimDatabase()
rc/com/android/bluetooth/opp/BluetoothOppService.java
0b1b0069658326e8c12dc0f887e4319c5227feb5 16-Mar-2010 Lixin Yue <L.X.YUE@motorola.com> Add ABORT request handling to PBAP
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
de773e60fed15a4ad13325089a5609c9bc6ede59 15-Mar-2010 Lixin Yue <L.X.YUE@motorola.com> Update notification in Transfer history manually when BT if off
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppTransferHistory.java
df25af65a20d30b18b4715d47ca6c0b2557116ad 10-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Trim Opp database when service restarts."
389f6dd45f7a45b12af847a510086125777e1198 03-Mar-2010 Lixin Yue <L.X.YUE@motorola.com> Trim Opp database when service restarts.

When Opp service restart, we will trim the database.
a) No visible case is deleted.
b) Invisible complete outbound (failed and successful) are deleted.
c) Invisible complete failed inbound are deleted.
d) Invisible complete success inbound are deleted if needed to keep records max
to 1000.

Live folder only has received files, so the above makes sense.

Change-Id: If27080721d9abed025162ff805f661fde01564d3
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/Constants.java
20844c451b1a82d683b3dd6169b00b03373f6531 10-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Not update TransferActivity button during activity creating."
0e927e914b80baf2d37439f8b99134cfe274a1d5 08-Mar-2010 Lixin Yue <L.X.YUE@motorola.com> Not update TransferActivity button during activity creating.

This is to fix below issue: when an ongoing transfer is almost to complete,
click the ongoing notification to launch TransferActivity, there will be
possible crash due to NullPointerException.
Root casue is: when TransferActivity onCreate() is called, the transfer is
still ongoing, so mIsComplete is false; but when onCreate() call to
updateProgressbar(), the transfer may change to complete, and then updateButton()
will be called; In updateButton(), mAlert (which will be initialized in father
class AlertActivity) still not intialized, which caused NullPointerException.

Change-Id: Ibfe363f3822386a38b9b108e29f60ad6673f70f6
rc/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
304373d31d7ead18ede5698c98e43615c1394058 09-Mar-2010 Jean-Baptiste Queru <jbq@google.com> Add an empty CleanSpec.mk

Change-Id: I3cdd8eee24082d0b0bf63d1bb80102cf8093b265
leanSpec.mk
509a6cd43906cce5f9bc78a83bd2058a4e5249e7 05-Mar-2010 Lixin Yue <L.X.YUE@motorola.com> Remove the number above status icon for Opp transfers
es/values/strings.xml
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
ac82c8cca9fa6728fe309852cfc0b223f1986dc8 04-Mar-2010 Eric Fischer <enf@google.com> Import new translations
es/values-zh-rTW/strings.xml
f6c72e8d6ec3d3eae78ef4850cfda7364d44a9bf 04-Mar-2010 Michael Chan <mchan@android.com> Merge "Add opp Transfer history to avoid cluster of notificatoins To reduce the cluster of Opp nofications, we introduce the concept of Opp transfer history. Only 2 notifications exist for finished opp transfers, one is for outbound transfers, and another is for inbound transfers. User can see all detailed items in corresponding screen when click the notification."
5cc617943765df27844e459362c4bc1821305216 26-Feb-2010 Lixin Yue <L.X.YUE@motorola.com> Add opp Transfer history to avoid cluster of notificatoins To reduce the cluster of Opp nofications, we introduce the concept of Opp transfer history. Only 2 notifications exist for finished opp transfers, one is for outbound transfers, and another is for inbound transfers. User can see all detailed items in corresponding screen when click the notification.

Change-Id: Iffed353ea6b0d7c958c71fe8d3996937058ced30
ndroidManifest.xml
es/layout/bluetooth_transfer_item.xml
es/layout/bluetooth_transfers_page.xml
es/layout/no_transfers.xml
es/menu/transferhistory.xml
es/menu/transferhistorycontextfinished.xml
es/values/strings.xml
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppTransferAdapter.java
rc/com/android/bluetooth/opp/BluetoothOppTransferHistory.java
rc/com/android/bluetooth/opp/Constants.java
fcce2453c8d9370d515f655b2706d5e00b9da139 04-Mar-2010 Daisuke Miyakawa <dmiyakawa@google.com> Add missing addHandler().

Bug: 2485875
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
02a85f25c5410e6e104c25ec3b109797db0aa18a 27-Feb-2010 Eric Fischer <enf@google.com> Import new translations.
es/values-cs/strings.xml
es/values-cs/strings_pbap.xml
es/values-da/strings.xml
es/values-da/strings_pbap.xml
es/values-de/strings.xml
es/values-de/strings_pbap.xml
es/values-el/strings.xml
es/values-el/strings_pbap.xml
es/values-es-rUS/strings.xml
es/values-es-rUS/strings_pbap.xml
es/values-es/strings.xml
es/values-es/strings_pbap.xml
es/values-fr/strings.xml
es/values-fr/strings_pbap.xml
es/values-it/strings.xml
es/values-it/strings_pbap.xml
es/values-ja/strings.xml
es/values-ja/strings_pbap.xml
es/values-ko/strings.xml
es/values-ko/strings_pbap.xml
es/values-nb/strings.xml
es/values-nb/strings_pbap.xml
es/values-nl/strings.xml
es/values-nl/strings_pbap.xml
es/values-pl/strings.xml
es/values-pl/strings_pbap.xml
es/values-pt-rPT/strings.xml
es/values-pt-rPT/strings_pbap.xml
es/values-pt/strings.xml
es/values-pt/strings_pbap.xml
es/values-ru/strings.xml
es/values-ru/strings_pbap.xml
es/values-sv/strings.xml
es/values-sv/strings_pbap.xml
es/values-tr/strings.xml
es/values-tr/strings_pbap.xml
es/values-zh-rCN/strings.xml
es/values-zh-rCN/strings_pbap.xml
es/values-zh-rTW/strings.xml
es/values-zh-rTW/strings_pbap.xml
198e5d109571b27b7c45c30ed3ea42febcb99201 23-Feb-2010 Daisuke Miyakawa <dmiyakawa@google.com> Move Pbap logic to Bluetooth package so that we do not have unnecessary tight coupling.
rc/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
3d48a779eba74e933514a279d28ceda03ad14d7c 23-Feb-2010 Jaikumar Ganesh <jaikumar@google.com> Removed Unused Strings and resources to reduce image size.

Bug: 2456698
es/layout/main.xml
es/values/strings.xml
es/values/strings_pbap.xml
5127e8ee29d085e6e2591b4fb4bc4534c80ce544 11-Feb-2010 Jeff Hamilton <jham@android.com> Add an original-package tag that matches the real package name.

Change-Id: I96a9ed96420c20f9291e004a2d9e02300d53ff26
ndroidManifest.xml
3a122f96371905dc80e496660f8cc1032d1cf634 05-Feb-2010 The Android Open Source Project <initial-contribution@android.com> am 0341ac9a: am 8916d261: reconcile main tree with open-source eclair

Merge commit '0341ac9aa9f48d71e10d8b1a7382a4ee75fbe3e2'

* commit '0341ac9aa9f48d71e10d8b1a7382a4ee75fbe3e2':
android-2.1_r1 snapshot
0341ac9aa9f48d71e10d8b1a7382a4ee75fbe3e2 05-Feb-2010 The Android Open Source Project <initial-contribution@android.com> am 8916d261: reconcile main tree with open-source eclair

Merge commit '8916d261ab985d191999ec9f8751819434ec4cc0' into eclair-plus-aosp

* commit '8916d261ab985d191999ec9f8751819434ec4cc0':
android-2.1_r1 snapshot
8916d261ab985d191999ec9f8751819434ec4cc0 05-Feb-2010 The Android Open Source Project <initial-contribution@android.com> reconcile main tree with open-source eclair
7e78db1249c74cc1b130c83f4d8f026f3753491a 29-Jan-2010 The Android Open Source Project <initial-contribution@android.com> reconcile android-2.1_r1 snapshot
7463f0141f0b5346837c747fbb3918e933e97722 28-Jan-2010 The Android Open Source Project <initial-contribution@android.com> am ac1140f7: merge from open-source master

Merge commit 'ac1140f71690c537a0a318446731611341e163b8'

* commit 'ac1140f71690c537a0a318446731611341e163b8':
empty initial commit
ac1140f71690c537a0a318446731611341e163b8 21-Jan-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master
9f20e7cea068dac8cb58d240969f211ed9263aa0 13-Jan-2010 The Android Open Source Project <initial-contribution@android.com> android-2.1_r1 snapshot
ndroid.mk
ndroidManifest.xml
ndroidManifest_test.xml
es/drawable-hdpi/bt_incomming_file_notification.png
es/drawable-hdpi/bt_share.png
es/drawable-hdpi/ic_launcher_folder_bluetooth.png
es/drawable-hdpi/icon.png
es/drawable-mdpi/bt_incomming_file_notification.png
es/drawable-mdpi/bt_share.png
es/drawable-mdpi/ic_launcher_folder_bluetooth.png
es/drawable-mdpi/icon.png
es/layout/access.xml
es/layout/auth.xml
es/layout/bt_enabling_progress.xml
es/layout/confirm_dialog.xml
es/layout/file_transfer.xml
es/layout/main.xml
es/layout/status_bar_ongoing_event_progress_bar.xml
es/layout/testactivity_main.xml
es/values-cs/strings.xml
es/values-cs/strings_pbap.xml
es/values-cs/test_strings.xml
es/values-da/strings.xml
es/values-da/strings_pbap.xml
es/values-da/test_strings.xml
es/values-de/strings.xml
es/values-de/strings_pbap.xml
es/values-de/test_strings.xml
es/values-el/strings.xml
es/values-el/strings_pbap.xml
es/values-el/test_strings.xml
es/values-es-rUS/strings.xml
es/values-es-rUS/strings_pbap.xml
es/values-es-rUS/test_strings.xml
es/values-es/strings.xml
es/values-es/strings_pbap.xml
es/values-es/test_strings.xml
es/values-fr/strings.xml
es/values-fr/strings_pbap.xml
es/values-fr/test_strings.xml
es/values-it/strings.xml
es/values-it/strings_pbap.xml
es/values-it/test_strings.xml
es/values-ja/strings.xml
es/values-ja/strings_pbap.xml
es/values-ja/test_strings.xml
es/values-ko/strings.xml
es/values-ko/strings_pbap.xml
es/values-ko/test_strings.xml
es/values-nb/strings.xml
es/values-nb/strings_pbap.xml
es/values-nb/test_strings.xml
es/values-nl/strings.xml
es/values-nl/strings_pbap.xml
es/values-nl/test_strings.xml
es/values-pl/strings.xml
es/values-pl/strings_pbap.xml
es/values-pl/test_strings.xml
es/values-pt-rPT/strings.xml
es/values-pt-rPT/strings_pbap.xml
es/values-pt-rPT/test_strings.xml
es/values-pt/strings.xml
es/values-pt/strings_pbap.xml
es/values-pt/test_strings.xml
es/values-ru/strings.xml
es/values-ru/strings_pbap.xml
es/values-ru/test_strings.xml
es/values-sv/strings.xml
es/values-sv/strings_pbap.xml
es/values-sv/test_strings.xml
es/values-tr/strings.xml
es/values-tr/strings_pbap.xml
es/values-tr/test_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rCN/strings_pbap.xml
es/values-zh-rCN/test_strings.xml
es/values-zh-rTW/strings.xml
es/values-zh-rTW/strings_pbap.xml
es/values-zh-rTW/test_strings.xml
es/values/strings.xml
es/values/strings_pbap.xml
es/values/test_strings.xml
rc/com/android/bluetooth/opp/BluetoothOppBatch.java
rc/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java
rc/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java
rc/com/android/bluetooth/opp/BluetoothOppBtErrorActivity.java
rc/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
rc/com/android/bluetooth/opp/BluetoothOppLiveFolder.java
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
rc/com/android/bluetooth/opp/BluetoothOppObexSession.java
rc/com/android/bluetooth/opp/BluetoothOppPreference.java
rc/com/android/bluetooth/opp/BluetoothOppProvider.java
rc/com/android/bluetooth/opp/BluetoothOppReceiveFileInfo.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommTransport.java
rc/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/BluetoothOppShareInfo.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
rc/com/android/bluetooth/opp/BluetoothOppTransferInfo.java
rc/com/android/bluetooth/opp/BluetoothOppUtility.java
rc/com/android/bluetooth/opp/BluetoothShare.java
rc/com/android/bluetooth/opp/Constants.java
rc/com/android/bluetooth/opp/TestActivity.java
rc/com/android/bluetooth/pbap/BluetoothPbapActivity.java
rc/com/android/bluetooth/pbap/BluetoothPbapAuthenticator.java
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapReceiver.java
rc/com/android/bluetooth/pbap/BluetoothPbapRfcommTransport.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
ad981c191c42eebd92bdacc46b5334088a1efb1b 11-Jan-2010 The Android Open Source Project <initial-contribution@android.com> empty initial commit
c85d534dc00abb4ed57c264195924b6f01931707 09-Jan-2010 Romain Guy <romainguy@android.com> Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
es/layout/access.xml
es/layout/auth.xml
es/layout/bt_enabling_progress.xml
es/layout/confirm_dialog.xml
es/layout/file_transfer.xml
es/layout/main.xml
es/layout/status_bar_ongoing_event_progress_bar.xml
es/layout/testactivity_main.xml
1c434055c672b70c5ef384f722e9a7fba9f8e259 08-Jan-2010 Eric Fischer <enf@google.com> Update with latest translations.
es/values-cs/strings.xml
es/values-cs/strings_pbap.xml
es/values-cs/test_strings.xml
es/values-da/strings.xml
es/values-da/strings_pbap.xml
es/values-da/test_strings.xml
es/values-de/strings.xml
es/values-de/strings_pbap.xml
es/values-de/test_strings.xml
es/values-el/strings.xml
es/values-el/strings_pbap.xml
es/values-el/test_strings.xml
es/values-es-rUS/strings.xml
es/values-es-rUS/strings_pbap.xml
es/values-es-rUS/test_strings.xml
es/values-es/strings.xml
es/values-es/strings_pbap.xml
es/values-es/test_strings.xml
es/values-fr/strings.xml
es/values-fr/strings_pbap.xml
es/values-fr/test_strings.xml
es/values-it/strings.xml
es/values-it/strings_pbap.xml
es/values-it/test_strings.xml
es/values-ja/strings.xml
es/values-ja/strings_pbap.xml
es/values-ja/test_strings.xml
es/values-ko/strings.xml
es/values-ko/strings_pbap.xml
es/values-ko/test_strings.xml
es/values-nb/strings.xml
es/values-nb/strings_pbap.xml
es/values-nb/test_strings.xml
es/values-nl/strings.xml
es/values-nl/strings_pbap.xml
es/values-nl/test_strings.xml
es/values-pl/strings.xml
es/values-pl/strings_pbap.xml
es/values-pl/test_strings.xml
es/values-pt-rPT/strings.xml
es/values-pt-rPT/strings_pbap.xml
es/values-pt-rPT/test_strings.xml
es/values-pt/strings.xml
es/values-pt/strings_pbap.xml
es/values-pt/test_strings.xml
es/values-ru/strings.xml
es/values-ru/strings_pbap.xml
es/values-ru/test_strings.xml
es/values-sv/strings.xml
es/values-sv/strings_pbap.xml
es/values-sv/test_strings.xml
es/values-tr/strings.xml
es/values-tr/strings_pbap.xml
es/values-tr/test_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rCN/strings_pbap.xml
es/values-zh-rCN/test_strings.xml
es/values-zh-rTW/strings.xml
es/values-zh-rTW/strings_pbap.xml
es/values-zh-rTW/test_strings.xml
36cb6d35a0d1f74f50cb81780c9a83b349bb3021 06-Jan-2010 Jean-Baptiste Queru <jbq@google.com> Do not use a user tag on apps, as it is ignored.

The build system does not honor user tags on apps,
and setting it is misleading.

This removes the confusion by making the makefiles
behave like they read.

Change-Id: I98697136596fd1dafd8d21c944cb258b4b7949e8
ndroid.mk
c6f1bacf1d4c39d7efd5dc98004d936c18ed51f1 23-Dec-2009 Lixin Yue <L.X.YUE@motorola.com> Move insert share info operation to a thread to avoid Receiver timeout

In OppReceiver, the function mOppManager.startTransfer(remoteDevice), which
is used to insert share records to DB, can be really a time-consuming
operation in case of 300 or more objects sharing case.
For onReceive() function in BroadcastReceiver, there are below specification:
The function is normally called within the main thread of its process, so you should never
perform long-running operations in it (there is a timeout of 10 seconds that the system allows
before considering the receiver to be blocked and a candidate to be killed)

Add handle to concurrent sending case
In Gellary, user can multiple select files (say 50files), and share via bluetooth to device1,
and then right away share via bluetooth to device2, and also can share to device3. In such
extream case, we need ensure all share info are saved to db.

Complete the TODO in OppManager
Store application data to SharedPreferences and restore them when service restart.
es/values/strings.xml
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
1f0fc26568c1babf0c66d2c75812b72e894eb0de 16-Dec-2009 Lixin Yue <L.X.YUE@motorola.com> Fix non-existing received file still appearing in live folder issue

After receiving a file by OPP from Bluetooth remote device, user can delete
this file from Gallery or 3rd party application. In Opp live folder, user
could still open this file, but with dialog "file not exist" displayed, and
there is no way to make this file disappear from liver folder.
Current solution is to delete the BT OPP DB record after openning an invalid
uri associated with the file in folder, as an easy method without syncing.
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
rc/com/android/bluetooth/opp/BluetoothOppUtility.java
a4508589f298c67fda54c344760ae39f0f375c11 10-Dec-2009 Lixin Yue <L.X.YUE@motorola.com> Update the error codes to be compatible with PBAP spec.

Catch IndexOutOfBoundsException and NullPointerException in Opp sendFile().
rc/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
6ef730f85e90a8246d06c7a58bb21eee5074945c 17-Dec-2009 Lixin Yue <L.X.YUE@motorola.com> Enable vcard share in OPP

Bluetooth OPP to handle x-vcard MIME type from contacts share
Handle vcard size by content type instead of tightening with contacts
ndroidManifest.xml
rc/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
rc/com/android/bluetooth/opp/Constants.java
4b79fdab44993073af04e00fad5d3a4b52ce5684 11-Dec-2009 Eric Fischer <enf@google.com> am 1b079725: (-s ours) am e381d79d: am da4092ba: (-s ours) Import revised translations. DO NOT MERGE

Merge commit '1b079725add337a35ec0157acc6365cec67a3cf1'

* commit '1b079725add337a35ec0157acc6365cec67a3cf1':
Import revised translations. DO NOT MERGE
1b079725add337a35ec0157acc6365cec67a3cf1 11-Dec-2009 Eric Fischer <enf@google.com> am e381d79d: am da4092ba: (-s ours) Import revised translations. DO NOT MERGE

Merge commit 'e381d79d0d9c6a787064ae42ec97d0ce2d21909f' into eclair-mr2-plus-aosp

* commit 'e381d79d0d9c6a787064ae42ec97d0ce2d21909f':
Import revised translations. DO NOT MERGE
e381d79d0d9c6a787064ae42ec97d0ce2d21909f 11-Dec-2009 Eric Fischer <enf@google.com> am da4092ba: (-s ours) Import revised translations. DO NOT MERGE

Merge commit 'da4092baa3ea8ec719f374f9567cc07cdfe48c55' into eclair-mr2

* commit 'da4092baa3ea8ec719f374f9567cc07cdfe48c55':
Import revised translations. DO NOT MERGE
da4092baa3ea8ec719f374f9567cc07cdfe48c55 10-Dec-2009 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE
es/values-zh-rCN/strings.xml
28d7b230060f7c3d80f7a1cb53fbea1a93c1ddf8 02-Dec-2009 Lixin Yue <L.X.YUE@motorola.com> am 11bac503: am 6414394c: am 6ee2d0e0: Fix Opp notifications timestamp not correct issue

Merge commit '11bac503a50bb1e9f465d176fcae3cd668ca6c70'

* commit '11bac503a50bb1e9f465d176fcae3cd668ca6c70':
Fix Opp notifications timestamp not correct issue
11bac503a50bb1e9f465d176fcae3cd668ca6c70 02-Dec-2009 Lixin Yue <L.X.YUE@motorola.com> am 6414394c: am 6ee2d0e0: Fix Opp notifications timestamp not correct issue

Merge commit '6414394c20cd885f5bd4561e06bbecac9c93cfb1' into eclair-mr2-plus-aosp

* commit '6414394c20cd885f5bd4561e06bbecac9c93cfb1':
Fix Opp notifications timestamp not correct issue
6414394c20cd885f5bd4561e06bbecac9c93cfb1 02-Dec-2009 Lixin Yue <L.X.YUE@motorola.com> am 6ee2d0e0: Fix Opp notifications timestamp not correct issue

Merge commit '6ee2d0e0405a074cf827e0c0ac4bfbffd1850cea' into eclair-mr2

* commit '6ee2d0e0405a074cf827e0c0ac4bfbffd1850cea':
Fix Opp notifications timestamp not correct issue
589899732e23e779d45c87a0e61c43052a9f0047 01-Dec-2009 Tao Liejun <a19884@motorola.com> am 5e95999a: am 019188fd: Merge change Ifb8562d3 into eclair-mr2

Merge commit '5e95999a79b94802b461160e1d7c9002c93356f4'

* commit '5e95999a79b94802b461160e1d7c9002c93356f4':
Add a few specific file type support
5e95999a79b94802b461160e1d7c9002c93356f4 30-Nov-2009 Tao Liejun <a19884@motorola.com> am 019188fd: Merge change Ifb8562d3 into eclair-mr2

Merge commit '019188fd686dbe7a9610255ea8aa61bd589a6bd1' into eclair-mr2-plus-aosp

* commit '019188fd686dbe7a9610255ea8aa61bd589a6bd1':
Add a few specific file type support
019188fd686dbe7a9610255ea8aa61bd589a6bd1 30-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ifb8562d3 into eclair-mr2

* changes:
Add a few specific file type support
6ee2d0e0405a074cf827e0c0ac4bfbffd1850cea 02-Nov-2009 Lixin Yue <L.X.YUE@motorola.com> Fix Opp notifications timestamp not correct issue

Should set the value of Notification.when before calling
setLatestEventInfo()

Dr No:Eastham
Bug: 2292381
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
fb8562d35d3b7d2fc60e1bb01a9c15cfe9824a94 18-Nov-2009 Tao Liejun <a19884@motorola.com> Add a few specific file type support

Support to receive and send a few specific file types
.xls, .zip, .doc, .ppt, .pdf
ndroidManifest.xml
rc/com/android/bluetooth/opp/Constants.java
a1c264cc9bdbbd8596124f35fe597bd46221ba83 26-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> am 5a591d7c: am 975bc7ee: am 03f598ba: Catch all exceptions while trying to send a file.

Merge commit '5a591d7c8562fca872ac907616f6b68917cebc9d'

* commit '5a591d7c8562fca872ac907616f6b68917cebc9d':
Catch all exceptions while trying to send a file.
5a591d7c8562fca872ac907616f6b68917cebc9d 26-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> am 975bc7ee: am 03f598ba: Catch all exceptions while trying to send a file.

Merge commit '975bc7ee50d8d5b596b1801f2c60057de122d2b0' into eclair-mr2-plus-aosp

* commit '975bc7ee50d8d5b596b1801f2c60057de122d2b0':
Catch all exceptions while trying to send a file.
975bc7ee50d8d5b596b1801f2c60057de122d2b0 26-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> am 03f598ba: Catch all exceptions while trying to send a file.

Merge commit '03f598bafa0fc0cbde0c5ab8fed89e07a67d482e' into eclair-mr2

* commit '03f598bafa0fc0cbde0c5ab8fed89e07a67d482e':
Catch all exceptions while trying to send a file.
03f598bafa0fc0cbde0c5ab8fed89e07a67d482e 25-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> Catch all exceptions while trying to send a file.

While trying to share pictures, some applications might
not have given the adequate permissions.

DrNo:Jsh
Bug:2284822
rc/com/android/bluetooth/opp/BluetoothOppService.java
c6aecd9dc440c91549d4c62b905c5959055cb3c8 17-Nov-2009 Eric Fischer <enf@google.com> am 4370c42a: (-s ours) am c17872fc: am 3238ec15: (-s ours) Import revised translations. DO NOT MERGE

Merge commit '4370c42a4afc3c7aa19dbd086bb65bfebbf6c788'

* commit '4370c42a4afc3c7aa19dbd086bb65bfebbf6c788':
Import revised translations. DO NOT MERGE
7245a0dc1596548ca2493bdb4eb00fd62994ea03 17-Nov-2009 Eric Fischer <enf@google.com> am dd0279d5: am 95b2e5f9: am 46979a81: (-s ours) Merge change I37f3fff6 into eclair

Merge commit 'dd0279d592788cfa0d88398c0d946c34a3affa37'

* commit 'dd0279d592788cfa0d88398c0d946c34a3affa37':
4370c42a4afc3c7aa19dbd086bb65bfebbf6c788 17-Nov-2009 Eric Fischer <enf@google.com> am c17872fc: am 3238ec15: (-s ours) Import revised translations. DO NOT MERGE

Merge commit 'c17872fc31d23b2e2a6f3f0d45e20fff349f09d2' into eclair-mr2-plus-aosp

* commit 'c17872fc31d23b2e2a6f3f0d45e20fff349f09d2':
Import revised translations. DO NOT MERGE
dd0279d592788cfa0d88398c0d946c34a3affa37 17-Nov-2009 Eric Fischer <enf@google.com> am 95b2e5f9: am 46979a81: (-s ours) Merge change I37f3fff6 into eclair

Merge commit '95b2e5f9505a995ce293339fab44c9ec7f7866ea' into eclair-mr2-plus-aosp

* commit '95b2e5f9505a995ce293339fab44c9ec7f7866ea':
c17872fc31d23b2e2a6f3f0d45e20fff349f09d2 17-Nov-2009 Eric Fischer <enf@google.com> am 3238ec15: (-s ours) Import revised translations. DO NOT MERGE

Merge commit '3238ec15a6e28571bcab5d89974eb00c8dba76c1' into eclair-mr2

* commit '3238ec15a6e28571bcab5d89974eb00c8dba76c1':
Import revised translations. DO NOT MERGE
3238ec15a6e28571bcab5d89974eb00c8dba76c1 17-Nov-2009 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE
es/values-zh-rCN/strings_pbap.xml
d10aa77acaaa0d095d41da5d00b98367bc6ef095 16-Nov-2009 Jean-Baptiste Queru <jbq@google.com> am 37c35377: merge from open-source master

Merge commit '37c35377fbcc31ffcb1851b234256687ba465a11'

* commit '37c35377fbcc31ffcb1851b234256687ba465a11':
Import revised translations. DO NOT MERGE
37c35377fbcc31ffcb1851b234256687ba465a11 15-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
95b2e5f9505a995ce293339fab44c9ec7f7866ea 14-Nov-2009 Eric Fischer <enf@google.com> am 46979a81: (-s ours) Merge change I37f3fff6 into eclair

Merge commit '46979a815f4bb0eed73ebc0836eef50ab1756e2b' into eclair-mr2

* commit '46979a815f4bb0eed73ebc0836eef50ab1756e2b':
Import revised translations. DO NOT MERGE
46979a815f4bb0eed73ebc0836eef50ab1756e2b 14-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I37f3fff6 into eclair

* changes:
Import revised translations. DO NOT MERGE
37f3fff63dcaf374771b6c22211c1de4c75cf33d 14-Nov-2009 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Approver: jerryw
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-da/strings_pbap.xml
es/values-it/strings.xml
es/values-sv/test_strings.xml
es/values-tr/strings_pbap.xml
ea340a27e69b129059449f07153e323034911092 13-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> am 5dc084a9: am 39a9c98e: Merge change I8b791d4f into eclair

Merge commit '5dc084a9ecbe35da9ac506ea4385e58d68e08aa5'

* commit '5dc084a9ecbe35da9ac506ea4385e58d68e08aa5':
Don't send default phone number for 0.vcf card.
5dc084a9ecbe35da9ac506ea4385e58d68e08aa5 13-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> am 39a9c98e: Merge change I8b791d4f into eclair

Merge commit '39a9c98edca4633348d91027b3481ee43d4aa588' into eclair-mr2

* commit '39a9c98edca4633348d91027b3481ee43d4aa588':
Don't send default phone number for 0.vcf card.
39a9c98edca4633348d91027b3481ee43d4aa588 13-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I8b791d4f into eclair

* changes:
Don't send default phone number for 0.vcf card.
2cd88df8ee77f6f1f1eb5d612075121f4185714b 13-Nov-2009 Eric Fischer <enf@google.com> am 9fa06d17: (-s ours) am 765403ef: (-s ours) Import revised translations. DO NOT MERGE

Merge commit '9fa06d17d94deb79989a61ed1d273085046a21ef'

* commit '9fa06d17d94deb79989a61ed1d273085046a21ef':
Import revised translations. DO NOT MERGE
8b791d4f581f31acf69f1297952c24aa39f01855 13-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> Don't send default phone number for 0.vcf card.

This prevents an entry "My name" with "000000" in the car kit contacts.
We now send only the name and the version in the vcf.
Ideally, we could like to send an empty vcard, but we would need to test
with various car kits with that works well.

Original Change by: Lixin Yue
Bug: 2247067
Dr No: Eastham
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
9fa06d17d94deb79989a61ed1d273085046a21ef 13-Nov-2009 Eric Fischer <enf@google.com> am 765403ef: (-s ours) Import revised translations. DO NOT MERGE

Merge commit '765403ef2fdb89dea90822590b9ac794b5a5a532' into eclair-mr2

* commit '765403ef2fdb89dea90822590b9ac794b5a5a532':
Import revised translations. DO NOT MERGE
765403ef2fdb89dea90822590b9ac794b5a5a532 13-Nov-2009 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Approver: jerryw
es/values-cs/strings_pbap.xml
es/values-da/strings_pbap.xml
es/values-de/strings_pbap.xml
es/values-el/strings_pbap.xml
es/values-es-rUS/strings_pbap.xml
es/values-es/strings_pbap.xml
es/values-fr/strings_pbap.xml
es/values-it/strings_pbap.xml
es/values-ja/strings_pbap.xml
es/values-ko/strings_pbap.xml
es/values-nb/strings_pbap.xml
es/values-nl/strings_pbap.xml
es/values-pl/strings_pbap.xml
es/values-pt-rPT/strings_pbap.xml
es/values-pt/strings_pbap.xml
es/values-ru/strings_pbap.xml
es/values-sv/strings_pbap.xml
es/values-tr/strings_pbap.xml
es/values-zh-rCN/strings_pbap.xml
es/values-zh-rTW/strings_pbap.xml
6b6d1148e02e56c366fb5c112f60f7302cd9295f 07-Nov-2009 Eric Fischer <enf@google.com> am 8eabbf92: (-s ours) Import revised translations. DO NOT MERGE

Merge commit '8eabbf92bc11dcb7c7d50e0c14ce7814a6dcd2de'

* commit '8eabbf92bc11dcb7c7d50e0c14ce7814a6dcd2de':
Import revised translations. DO NOT MERGE
8eabbf92bc11dcb7c7d50e0c14ce7814a6dcd2de 07-Nov-2009 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE
es/values-cs/strings.xml
es/values-cs/strings_pbap.xml
es/values-cs/test_strings.xml
es/values-da/strings.xml
es/values-da/strings_pbap.xml
es/values-da/test_strings.xml
es/values-de/strings.xml
es/values-de/strings_pbap.xml
es/values-de/test_strings.xml
es/values-el/strings.xml
es/values-el/strings_pbap.xml
es/values-el/test_strings.xml
es/values-es-rUS/strings.xml
es/values-es-rUS/strings_pbap.xml
es/values-es-rUS/test_strings.xml
es/values-es/strings.xml
es/values-es/strings_pbap.xml
es/values-es/test_strings.xml
es/values-fr/strings.xml
es/values-fr/strings_pbap.xml
es/values-fr/test_strings.xml
es/values-it/strings.xml
es/values-it/strings_pbap.xml
es/values-it/test_strings.xml
es/values-ja/strings.xml
es/values-ja/strings_pbap.xml
es/values-ja/test_strings.xml
es/values-ko/strings.xml
es/values-ko/strings_pbap.xml
es/values-ko/test_strings.xml
es/values-nb/strings.xml
es/values-nb/strings_pbap.xml
es/values-nb/test_strings.xml
es/values-nl/strings.xml
es/values-nl/strings_pbap.xml
es/values-nl/test_strings.xml
es/values-pl/strings.xml
es/values-pl/strings_pbap.xml
es/values-pl/test_strings.xml
es/values-pt-rPT/strings.xml
es/values-pt-rPT/strings_pbap.xml
es/values-pt-rPT/test_strings.xml
es/values-pt/strings.xml
es/values-pt/strings_pbap.xml
es/values-pt/test_strings.xml
es/values-ru/strings.xml
es/values-ru/strings_pbap.xml
es/values-ru/test_strings.xml
es/values-sv/strings.xml
es/values-sv/strings_pbap.xml
es/values-sv/test_strings.xml
es/values-tr/strings.xml
es/values-tr/strings_pbap.xml
es/values-tr/test_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rCN/strings_pbap.xml
es/values-zh-rCN/test_strings.xml
es/values-zh-rTW/strings.xml
es/values-zh-rTW/strings_pbap.xml
es/values-zh-rTW/test_strings.xml
161e880b4ee2c7eca87a41e8bffdb49a72894776 06-Nov-2009 Lixin Yue <L.X.YUE@motorola.com> am 5ce62e92: am cd5ed0c7: PBAP only transfer contacts that are visible in contacts application.

Merge commit '5ce62e929e6ce169be5c32c173efc44f76684e2d'

* commit '5ce62e929e6ce169be5c32c173efc44f76684e2d':
PBAP only transfer contacts that are visible in contacts application.
5ce62e929e6ce169be5c32c173efc44f76684e2d 06-Nov-2009 Lixin Yue <L.X.YUE@motorola.com> am cd5ed0c7: PBAP only transfer contacts that are visible in contacts application.

Merge commit 'cd5ed0c7d04119e508fbddfd9656ef8559e3e524' into eclair-mr2

* commit 'cd5ed0c7d04119e508fbddfd9656ef8559e3e524':
PBAP only transfer contacts that are visible in contacts application.
cd5ed0c7d04119e508fbddfd9656ef8559e3e524 05-Nov-2009 Lixin Yue <L.X.YUE@motorola.com> PBAP only transfer contacts that are visible in contacts application.

This is to address below issue:
There have been reports by users where they are seeing contacts in the
carkit that are not present in the Contacts App UI but are present in the
database.

Bug: 2245178
Dr No: Eastham
es/values/strings_pbap.xml
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
021c272a3edc026ce95cc775ffb8d47ac554525a 05-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> am ae7f7056: am 2b36e173: Fix get contact size not correct issue.

Merge commit 'ae7f70563660d02d56365092fa27f195b54d5d15'

* commit 'ae7f70563660d02d56365092fa27f195b54d5d15':
Fix get contact size not correct issue.
ae7f70563660d02d56365092fa27f195b54d5d15 05-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> am 2b36e173: Fix get contact size not correct issue.

Merge commit '2b36e1731eb5ed784abc1a374eb69d8523123df1' into eclair-mr2

* commit '2b36e1731eb5ed784abc1a374eb69d8523123df1':
Fix get contact size not correct issue.
c817cafc46b9378ebffab9911dac3c6de5dfb971 03-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> am 757c85e4: (-s ours) am c065fc55: (-s ours) Disable sending Photo field for PBAP. Do Not Merge.

Merge commit '757c85e4ce37336dbd549718fbf09a1b36ae4da5'

* commit '757c85e4ce37336dbd549718fbf09a1b36ae4da5':
Disable sending Photo field for PBAP. Do Not Merge.
757c85e4ce37336dbd549718fbf09a1b36ae4da5 03-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> am c065fc55: (-s ours) Disable sending Photo field for PBAP. Do Not Merge.

Merge commit 'c065fc5530cc0e8f14261f8c347984cdde070169' into eclair-mr2

* commit 'c065fc5530cc0e8f14261f8c347984cdde070169':
Disable sending Photo field for PBAP. Do Not Merge.
2b36e1731eb5ed784abc1a374eb69d8523123df1 30-Oct-2009 Jaikumar Ganesh <jaikumar@google.com> Fix get contact size not correct issue.

Call history handles should be ordered by "date DESC" per spec. The first
handle 1.vcf should be the most recently happend call.

Add order support for pullVcardListing reqeust:
One typical use case for PBAP is: first use pullVcardListing request to
display the contacts list, then use pullVcardEntry request to tirgger
the selected contact vcard. In such case, we need keep the contact db
query consistent for pullVcardListing and pullVcardEntry.

Use "Own number" for phone owner number instead of "Unknown name" in case
can not get the name from system.

Original Change: Fan Jackson
Dr No: Eastham
Bug Id: 2183320
es/values/strings_pbap.xml
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
443dc6254dfd26b8354afff83adc946299521446 02-Nov-2009 Daisuke Miyakawa <dmiyakawa@google.com> am 31cea05f: Merge change I51d7be27 into eclair-mr2

Merge commit '31cea05f854d0f7b9be07472d85128cc0f44e85a'

* commit '31cea05f854d0f7b9be07472d85128cc0f44e85a':
Fix a typo.
e5ae7fbf519dba9bb204dc4977117e9f56726f39 02-Nov-2009 Daisuke Miyakawa <dmiyakawa@google.com> am e10881ae: Fix a typo.

Merge commit 'e10881ae39eb4affb7a78827f2060964e8534515'

* commit 'e10881ae39eb4affb7a78827f2060964e8534515':
Fix a typo.
31cea05f854d0f7b9be07472d85128cc0f44e85a 02-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I51d7be27 into eclair-mr2

* changes:
Fix a typo.
51d7be27c1e6303ae9806842ff4f3766d3ce7623 02-Nov-2009 Daisuke Miyakawa <dmiyakawa@google.com> Fix a typo.
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
e10881ae39eb4affb7a78827f2060964e8534515 02-Nov-2009 Daisuke Miyakawa <dmiyakawa@google.com> Fix a typo.
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
c065fc5530cc0e8f14261f8c347984cdde070169 30-Oct-2009 Jaikumar Ganesh <jaikumar@google.com> Disable sending Photo field for PBAP. Do Not Merge.

Some car kits don't handle contacts with Photo Fields well.
Disable this field for the time being.

Original Change by: Yue Lixin

Bug: 2183320
Dr No: Eastham
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
57549cc8a0e6ad816dbf70e3aab4794d5b0ed2aa 22-Oct-2009 Eric Fischer <enf@google.com> am d74a0f97: (-s ours) am 99232162: (-s ours) Import revised translations. DO NOT MERGE

Merge commit 'd74a0f978908797aab90190ad243e0ee8f42a04d'

* commit 'd74a0f978908797aab90190ad243e0ee8f42a04d':
Import revised translations. DO NOT MERGE
d74a0f978908797aab90190ad243e0ee8f42a04d 22-Oct-2009 Eric Fischer <enf@google.com> am 99232162: (-s ours) Import revised translations. DO NOT MERGE

Merge commit '992321621151fb0c6d8784c3009472a29f0c6a89' into eclair-mr2

* commit '992321621151fb0c6d8784c3009472a29f0c6a89':
Import revised translations. DO NOT MERGE
992321621151fb0c6d8784c3009472a29f0c6a89 21-Oct-2009 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Approver: jerryw
es/values-cs/strings.xml
es/values-cs/strings_pbap.xml
es/values-cs/test_strings.xml
es/values-da/strings.xml
es/values-da/strings_pbap.xml
es/values-da/test_strings.xml
es/values-de/strings.xml
es/values-de/strings_pbap.xml
es/values-de/test_strings.xml
es/values-el/strings.xml
es/values-el/strings_pbap.xml
es/values-el/test_strings.xml
es/values-es-rUS/strings.xml
es/values-es-rUS/strings_pbap.xml
es/values-es-rUS/test_strings.xml
es/values-es/strings.xml
es/values-es/strings_pbap.xml
es/values-es/test_strings.xml
es/values-fr/strings.xml
es/values-fr/strings_pbap.xml
es/values-fr/test_strings.xml
es/values-it/strings.xml
es/values-it/strings_pbap.xml
es/values-it/test_strings.xml
es/values-ja/strings.xml
es/values-ja/strings_pbap.xml
es/values-ja/test_strings.xml
es/values-ko/strings.xml
es/values-ko/strings_pbap.xml
es/values-ko/test_strings.xml
es/values-nb/strings.xml
es/values-nb/strings_pbap.xml
es/values-nb/test_strings.xml
es/values-nl/strings.xml
es/values-nl/strings_pbap.xml
es/values-nl/test_strings.xml
es/values-pl/strings.xml
es/values-pl/strings_pbap.xml
es/values-pl/test_strings.xml
es/values-pt-rPT/strings.xml
es/values-pt-rPT/strings_pbap.xml
es/values-pt-rPT/test_strings.xml
es/values-pt/strings.xml
es/values-pt/strings_pbap.xml
es/values-pt/test_strings.xml
es/values-ru/strings.xml
es/values-ru/strings_pbap.xml
es/values-ru/test_strings.xml
es/values-sv/strings.xml
es/values-sv/strings_pbap.xml
es/values-sv/test_strings.xml
es/values-tr/strings.xml
es/values-tr/strings_pbap.xml
es/values-tr/test_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rCN/strings_pbap.xml
es/values-zh-rCN/test_strings.xml
es/values-zh-rTW/strings.xml
es/values-zh-rTW/strings_pbap.xml
es/values-zh-rTW/test_strings.xml
63ea6e4a36ee0c3c39695e3e143d04e7b874f749 15-Oct-2009 Daisuke Miyakawa <dmiyakawa@google.com> am 59582607: Fix a build breakage.

Merge commit '59582607bc341f9e9662d6ec5c1a93bb4c537d38'

* commit '59582607bc341f9e9662d6ec5c1a93bb4c537d38':
Fix a build breakage.
59582607bc341f9e9662d6ec5c1a93bb4c537d38 15-Oct-2009 Daisuke Miyakawa <dmiyakawa@google.com> Fix a build breakage.

Make Bluetooth code use new type instead of old.
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
dd2bc2f3513051de175d5c373ccaeb0cfbba2794 14-Oct-2009 Eric Fischer <enf@google.com> am 19b9dd3e: (-s ours) Import revised translations. DO NOT MERGE

Merge commit '19b9dd3e31e2e7deff759506f9442b08426b91d7'

* commit '19b9dd3e31e2e7deff759506f9442b08426b91d7':
Import revised translations. DO NOT MERGE
21357612aa74134e856109a9bb4a1a545252090c 14-Oct-2009 Daisuke Miyakawa <dmiyakawa@google.com> am 4ceaa3e0: Adapt to the new interface of vCard code.

Merge commit '4ceaa3e03dc7a68d4e7c0c8e14a461cfd7c4c19c'

* commit '4ceaa3e03dc7a68d4e7c0c8e14a461cfd7c4c19c':
Adapt to the new interface of vCard code.
2eef830bdf53d982bccf0e7f31f3877e92cfdc69 14-Oct-2009 Eric Fischer <enf@google.com> am da9ca291: (-s ours) am 5b61241c: (-s ours) Import revised translations. DO NOT MERGE

Merge commit 'da9ca2915b56dc964ce1e4e53c0cd9085a3c7ea4'

* commit 'da9ca2915b56dc964ce1e4e53c0cd9085a3c7ea4':
Import revised translations. DO NOT MERGE
3f87c3c928e788c6b803d80802f9674d120be51c 14-Oct-2009 Eric Fischer <enf@google.com> Reimport translations.

Change-Id: Ib613aca3ba7ad0ab906210da90f28699ec96d5dd
es/values-es-rUS/strings.xml
es/values-es-rUS/strings_pbap.xml
es/values-es-rUS/test_strings.xml
19b9dd3e31e2e7deff759506f9442b08426b91d7 14-Oct-2009 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE
es/values-es-rUS/strings.xml
es/values-es-rUS/strings_pbap.xml
es/values-es-rUS/test_strings.xml
4ceaa3e03dc7a68d4e7c0c8e14a461cfd7c4c19c 12-Oct-2009 Daisuke Miyakawa <dmiyakawa@google.com> Adapt to the new interface of vCard code.

Internal Issue number: 2160039
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
da9ca2915b56dc964ce1e4e53c0cd9085a3c7ea4 10-Oct-2009 Eric Fischer <enf@google.com> am 5b61241c: (-s ours) Import revised translations. DO NOT MERGE

Merge commit '5b61241c90be1a30d18fe6da116edc16d0ea1b1e' into eclair-mr2

* commit '5b61241c90be1a30d18fe6da116edc16d0ea1b1e':
Import revised translations. DO NOT MERGE
5b61241c90be1a30d18fe6da116edc16d0ea1b1e 10-Oct-2009 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Approver: jerryw
es/values-es-rUS/strings.xml
es/values-es-rUS/strings_pbap.xml
es/values-es-rUS/test_strings.xml
b506e52fabbc02445f3652049ed8a390d4fcaa7f 09-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I428bc0fc into eclair

* changes:
Remove STOPSHIP BT logging.
0e6233ffba67e757f60171803d7ab376cf73c16c 09-Oct-2009 Nick Pelly <npelly@google.com> Remove STOPSHIP BT logging.

Do not merge.

Change-Id: I428bc0fc67030f24112f2e9c865824dfaea4897d
DrNo: eastham
Bug: 2089423
Joke: Why does E.T. have such big eyes? Because he saw his phone bill.
rc/com/android/bluetooth/opp/Constants.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
59256dee3f9787fd660c346d61e0271ecd4bfe9a 08-Oct-2009 Jaikumar Ganesh <jaikumar@google.com> Update PBAP code for Contacts database changes and check for OPP
file extension.

Original Author for PBAP - Yue Lixin
Dr No: Eastham
Bug: 2174759
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
rc/com/android/bluetooth/opp/BluetoothOppReceiveFileInfo.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
3a88b20fcd71e42451e402d27374b19eeb2ff0da 08-Oct-2009 Nick Pelly <npelly@google.com> Update application code for BluetoothAdapter.getDefaultAdapter().

Change-Id: I7baafb909b74783da4e51d48f2465e7aacf07eb5
DrNo: eastham
Bug: 2158765
Joke: What goes 99-thump, 99-thump? A centipede with a wooden leg.
rc/com/android/bluetooth/opp/BluetoothOppBatch.java
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
rc/com/android/bluetooth/opp/BluetoothOppUtility.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
4787d49803e48d58c78be2debe0631b51002d3fb 05-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I773ca65d into eclair

* changes:
Remove Disconnected and Connected PBAP toasts.
773ca65d26f0eb0eda3ec44c2a788043387981cf 05-Oct-2009 Jaikumar Ganesh <jaikumar@google.com> Remove Disconnected and Connected PBAP toasts.

Original Author: Fan Jackson
Bug number: 2060933
Dr No: Eastham
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
7ede63eb103186a0a28b5ac52061ff70aa6552f3 04-Oct-2009 Dianne Hackborn <hackbod@google.com> Work on issue #2163789: Way too much logging

Dr.No from mcleron.

Change-Id: I1a0475bebcb7e38ae4859c18afe9d5b093544e09
ndroidManifest.xml
56581208a2c3de91505f22137a9e115ecc123431 02-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I196e84e5 into eclair

* changes:
More icons
196e84e59b71c940c91f4906532f9f4facccb15a 02-Oct-2009 Mike Cleron <mcleron@google.com> More icons
es/drawable-hdpi/bt_share.png
es/drawable-hdpi/icon.png
es/drawable-mdpi/bt_share.png
es/drawable-mdpi/icon.png
es/drawable/bt_share.png
0eb2230d3b7c184a00599e8ab70331c599e9ef1c 02-Oct-2009 Jaikumar Ganesh <jaikumar@google.com> Fix ANR by repeating BT ON/OFF caused by PBAP closeservice deadlock

Move back socket closing sequence ahead of Thread.shutdown and join operation;
Seperate socket closing and resetting as null to avoid NPE during service close

Original Author: Fan Jackson
Bug: 2158262
DrNo: Paul

Change-Id: I2b36f3fb920c80602f5734a67a8cf6c6fbd00de4
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
08d28dc0ff8d9d35e75de77b7405dbeef5b009b4 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I3d0e5c00 into eclair

* changes:
Placeholder mdpi assets
29a07d9c52cde18ee818fd21528288cd5c8127c8 30-Sep-2009 Daisuke Miyakawa <dmiyakawa@google.com> Remove redundant dependency toward android.syncml.
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
3d0e5c00c825760527f02979c1be960995c8ae09 30-Sep-2009 Mike Cleron <mcleron@google.com> Placeholder mdpi assets
es/drawable-mdpi/ic_launcher_folder_bluetooth.png
e42f4c90d20e3192c18bbe8fad98059b0c910cd7 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I8222c790 into eclair

* changes:
Update OPP/PBAP service to use onStartCommand() Adjust function call seqence in PBAP closeService
8222c7902a2281929fd31e840f6012038e6fa44a 29-Sep-2009 Lixin Yue <L.X.YUE@motorola.com> Update OPP/PBAP service to use onStartCommand()
Adjust function call seqence in PBAP closeService
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
e150ffc5f880bb4832715a6d51329b775c727bea 30-Sep-2009 Mike Cleron <mcleron@google.com> Newer icons
es/drawable-hdpi/ic_launcher_folder_bluetooth.png
8ca36dbaf283811adc4e6eb014fc1e7144602c24 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I60a29b85 into eclair

* changes:
New hdpi assets.
507ea28c4eafe2096f065fcc5e29190460ac9b11 30-Sep-2009 Daniel Sandler <dsandler@google.com> New hdpi assets.

Drop dated 29-Sep-2009.

Change-Id: I60a29b855fd8c259e16408006a5a3c5cf768dc7d
es/drawable-hdpi/bt_incomming_file_notification.png
es/drawable-mdpi/bt_incomming_file_notification.png
es/drawable/bt_incomming_file_notification.png
b0fa09caef6a0748a568dc2a89f5d94b85423bb2 29-Sep-2009 Lixin Yue <L.X.YUE@motorola.com> Update OPP/PBAP UI

Add timeout handling to incoming file confirm dialog, to avoid uncertain
behavior when timeout happen
Fix PBAP request timeout issue when open/close slider, dismiss timeout
dialog to avoid uncertain behavior
Fix typo in strings
es/values/strings.xml
es/values/strings_pbap.xml
es/values/test_strings.xml
rc/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/opp/BluetoothShare.java
rc/com/android/bluetooth/pbap/BluetoothPbapActivity.java
c1a5501b401400368379681cbb961dd5c38311c6 29-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Iae70ee2e into eclair

* changes:
New icons
ae70ee2e23af50ecf93f071245c44bee258e9be3 29-Sep-2009 Mike Cleron <mcleron@google.com> New icons
ndroidManifest.xml
es/drawable-hdpi/ic_launcher_folder_bluetooth.png
4ef0999864c582e64b62ecf46a569574e7cae9a1 29-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I18bde766 into eclair

* changes:
Update PBAP to make compatiable with spec
18bde766b20c899310ebdd5ca823e30ff27d407f 27-Sep-2009 Lixin Yue <L.X.YUE@motorola.com> Update PBAP to make compatiable with spec

Add check to incoming application parameter, be nice to accept PCE request
Fix minor pullvCardEntry issue for call logs
Fix one pullPhoneBook issue about request size
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
668a8d617ac827770a484ad6b3f329ee248745ee 28-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ifb946935 into eclair

* changes:
Added WhiteList of acceptable MIME types for OBEX transfers. Part of OBEX/OPP security review. Bug information: http://b/issue?id=1972237
fb946935fe50d957e835ac00a592bd3d222edef3 28-Sep-2009 Oscar Montemayor <oam@android.com> Added WhiteList of acceptable MIME types for OBEX transfers. Part of OBEX/OPP security review.
Bug information: http://b/issue?id=1972237
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
rc/com/android/bluetooth/opp/Constants.java
202e9f669d8972d6371c349ed65f311de465be1a 28-Sep-2009 Nick Pelly <npelly@google.com> Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid

Change-Id: Ia0eb46d9bdff6a8ab3333bb0ad1f66d0303c135a
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
6fbad3dd950238d871c4efce4eb258ae1a54b878 27-Sep-2009 Oscar Montemayor <oam@android.com> Proposed file canonical path prevetion for directory trasvesal attacks. Fix suggested by meder@google.com.
More fixes form CR comments.
rc/com/android/bluetooth/opp/BluetoothOppReceiveFileInfo.java
2f8fe66f45bac2bc61395bd4f8de553f4c2b7c30 24-Sep-2009 Lixin Yue <L.X.YUE@motorola.com> Update PBAP to use new VCardComposer

Totally removed the use of old syncml.pim.vcard.VCardComposer
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapRfcommTransport.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
9d9e511fe7425fb3105ece227ecedb43d6333333 21-Sep-2009 Tao Liejun <L.J.Tao@motorola.com> Use new SDP API for OPP

Use new API BluetoothDevice.fetchUuidsWithSdp() to query SDP for un-paired device, and request SDP
update when Opp is not in cache.
Handle a concurrent case when incoming connection and file share happens together
Some other minor changes

Change-Id: I7ebf34801518867553551d8f7bba7ac62e22667e
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
rc/com/android/bluetooth/opp/BluetoothOppReceiveFileInfo.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/BluetoothOppShareInfo.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/opp/Constants.java
c4b72ebe2ed9cd29c40a75411702ca9dca9424ac 24-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26736 into eclair

* changes:
Update opp/pbap look and feel
38416553a26e55963e11276f1029d78e9e6cad70 23-Sep-2009 Rich Cannings <richc@google.com> Fixes NullPointerException that crashes Bluetooth when filename ends end with slash, e.g.: 'fooo..txt/'.

choosefilename() can return null. We should handle this result and grecefully fail.
rc/com/android/bluetooth/opp/BluetoothOppReceiveFileInfo.java
dc3bacd6eb626a93f2c3c4c62b3ef6aa9e575d92 21-Sep-2009 Lixin Yue <L.X.YUE@motorola.com> Update opp/pbap look and feel

Update OPP BtEnabling Dialog-add timeout handling, handle Bluetooth ON intent, handle back key

Change-Id: I3d3ade3a9a4de645ddb7195e8b81ca42afb3d31e
ndroidManifest.xml
es/layout/access.xml
es/layout/auth.xml
es/layout/bt_enabling_progress.xml
es/layout/file_transfer.xml
es/values/strings.xml
rc/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java
rc/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java
rc/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
1f556d99c4bb7cae5ed55c171ce7f65b5010fa57 22-Sep-2009 Oscar Montemayor <oam@android.com> Replaced back-slashes on hint path URI with forward-slahes, more in line with Linux FS conventions.
Code review changes incorporated patch set 3 rev.
rc/com/android/bluetooth/opp/BluetoothOppReceiveFileInfo.java
68eee196dd28c335a5b4802e03749dcd060dfbac 21-Sep-2009 Roy West <rwest@google.com> Fix build -- unescaped apostrophes in strings...
es/values/strings.xml
1a0f9907cbba84540f9698e40afc5126b8ced716 21-Sep-2009 Roy West <rwest@google.com> Edit Bluetooth strings for bug1999173.
es/values/strings.xml
68ea2a43de2e7cee20c03332ed9f5ff004e42884 02-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> Change handling of remoteUuids.
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
53647ab9a3f5efdf97c58b2432b37236b38264f9 12-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> Fix incoming file transfer dialog look and feel.
ndroidManifest.xml
es/layout/confirm_dialog.xml
bd540686f027d3d590c08821d7192366362b8dd2 11-Sep-2009 Nick Pelly <npelly@google.com> Update AndroidManifest.xml for Bluetooth API changes.

There was a regression with the Bluetooth API changes because I forgot to update
the manifests. Bluetooth.apk would have missed the BT on/off intents.

Change-Id: Ida94411d73826d6ff6a95c3370d8d2d49a8ab20e
ndroidManifest.xml
ndroidManifest_test.xml
f2c447b81c6c03cb1c8a3e64a10381e23934834a 10-Sep-2009 Nick Pelly <npelly@google.com> Update application for Bluetooth API changes.

Change-Id: I618553f2aa4e8705e3dff1247752e5fc357ef94d
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/pbap/BluetoothPbapReceiver.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
613bae227d65f61903e196944a9c718b4394f25a 09-Sep-2009 Nick Pelly <npelly@google.com> Update application for Bluetooth API change: deprecation of BluetoothError.
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/pbap/BluetoothPbapReceiver.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
f4a286ee2aba5a75abe41881334bbdb5d0080105 09-Sep-2009 Nick Pelly <npelly@google.com> Update application for Bluetooth API change.
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/pbap/BluetoothPbapReceiver.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
c5495c585c0d19cdd20963e5a2144e5f984a306e 09-Sep-2009 Lixin Yue <L.X.YUE@motorola.com> Update PBAP to be compatible with Mecel stack

The response to the targeted connect operation should contain a Who with the same UUID as
sent in the request's matching Target header. If the Who header was present in the request,
a Target header identifying the same client should be sent in the response.

Play ringtone for incoming PBAP connection request
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
4446eaa935994bc91d6d308303e8d27526b4590d 31-Aug-2009 Lixin Yue <L.X.YUE@motorola.com> Pbap update

Improve PBAP download contacts performance greatly
Add 10 times retry for creation of listening socket
Change PbapReciever to be clearer
Rename functions and adjust function sequence in PbapService
Cleanup logging
Remove unused functions
Remove serversocket polling
es/values/strings_pbap.xml
rc/com/android/bluetooth/pbap/BluetoothPbapActivity.java
rc/com/android/bluetooth/pbap/BluetoothPbapAuthenticator.java
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapReceiver.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
5c670ec88d1c59e5ad32b0264552199f3d6073c5 01-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23495 into eclair

* changes:
Workaround bug in Poloroid Pogo.
fa5d402906010cd17c8ed7de0dbcbfdcb78dab20 01-Sep-2009 Nick Pelly <npelly@google.com> Workaround bug in Poloroid Pogo.

Rename extra dots to underscores.

Working with Poloroid to get an updated list of affected MAC addresses. For now
we just have 00:04:48.
rc/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
rc/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
acab258c177d82338b1696360cd0b8c9821b0f03 26-Aug-2009 Lixin Yue <L.X.YUE@motorola.com> Allow Pbap if device is trusted
rc/com/android/bluetooth/pbap/BluetoothPbapActivity.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
888485a3f5fe991116c5536bb6d6903d47b63a70 31-Aug-2009 Tao Liejun <L.J.Tao@motorola.com> Cleanup Opp debug code

Stop Rfcomm polling
Delete a few unused functions
ndroidManifest_test.xml
rc/com/android/bluetooth/opp/BluetoothOppBatch.java
rc/com/android/bluetooth/opp/BluetoothOppPreference.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/opp/BluetoothOppUtility.java
rc/com/android/bluetooth/opp/Constants.java
rc/com/android/bluetooth/opp/TestActivity.java
rc/com/android/bluetooth/opp/TestTcpListener.java
rc/com/android/bluetooth/opp/TestTcpServer.java
rc/com/android/bluetooth/opp/TestTcpSessionNotifier.java
rc/com/android/bluetooth/opp/TestTcpTransport.java
32e47df203390052c1ef771d78b22fc4aa5f9e72 27-Aug-2009 Tao Liejun <L.J.Tao@motorola.com> Simplify wakelock release for Obex Server
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
68b5ac1b48d77ef4df31a1e538959fbbbcebb532 28-Aug-2009 Daniel Sandler <dsandler@google.com> High-resolution (hdpi) artwork from TAT for Bluetooth.
es/drawable-hdpi/icon.png
es/drawable-mdpi/icon.png
es/drawable/icon.png
ce4d93666275df294cb073fe41de5b85932570a8 28-Aug-2009 Nick Pelly <npelly@google.com> Clean up Logging.

Use the pattern if (V) Log.v(...); for logging. The Android style prefers curly braces, but for log lines it is ok to use a one-liner to keep the code manageable.

Remove spaces from some log tags, and rename TAG BluetoothShareProvider to BluetoothOpp.

Rename LOGVV to V, and LOGV to D.

Just before ship we will change Constants.DEBUG and Constants.VERBOSE to false to compile out all the logging code.
rc/com/android/bluetooth/opp/BluetoothOppBatch.java
rc/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java
rc/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java
rc/com/android/bluetooth/opp/BluetoothOppBtErrorActivity.java
rc/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
rc/com/android/bluetooth/opp/BluetoothOppPreference.java
rc/com/android/bluetooth/opp/BluetoothOppProvider.java
rc/com/android/bluetooth/opp/BluetoothOppReceiveFileInfo.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
rc/com/android/bluetooth/opp/BluetoothOppUtility.java
rc/com/android/bluetooth/opp/Constants.java
rc/com/android/bluetooth/opp/TestTcpListener.java
rc/com/android/bluetooth/opp/TestTcpServer.java
d6641e4a7bb22833e1c07cb3af7989835fa7e16d 19-Aug-2009 Tao Liejun <L.J.Tao@motorola.com> Remove Device picker
ndroidManifest.xml
es/drawable/ic_bt_cellphone.png
es/drawable/ic_bt_laptop.png
es/layout/bluetooth_pin_entry.xml
es/layout/device_picker.xml
es/layout/preference_bluetooth.xml
es/layout/preference_progress_category.xml
es/values/strings.xml
rc/com/android/bluetooth/opp/BluetoothDevicePickerActivity.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerBtStatus.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerDevice.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerDeviceManager.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerDevicePreference.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerListener.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerManager.java
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothPinDialog.java
rc/com/android/bluetooth/opp/BluetoothShare.java
rc/com/android/bluetooth/opp/ProgressCategory.java
1ac5507790a87810061a19dadec36eb328a222ea 07-Aug-2009 Tao Liejun <L.J.Tao@motorola.com> OPP update

Rewrite provider permission to allow LiveFolders work
Support file:// uri to share file
Support multiple share from gallery
Fully support sending file queue
Hold incoming connection for a while when OPP is busy instead of reject directly
Move notification update to a thread
Handle many error cases to display correct error messages
Improve server/client timeout
Delete empty file after reject incoming file
Support upper case incoming file extension
Avoid multiple mediascanner connections
ndroidManifest.xml
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
rc/com/android/bluetooth/opp/BluetoothOppProvider.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/opp/Constants.java
41ef8d494511c040451f2f887cb31c3100746b61 07-Aug-2009 Nick Pelly <npelly@google.com> Bluetooth: Update Bluetooth.apk to match BT API change.

Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.

BluetoothAdapter: Represents the local BT adapter. Operations on the local
adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
(pair, connect, etc).
rc/com/android/bluetooth/opp/BluetoothDevicePickerActivity.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerDevice.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerDeviceManager.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerListener.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerManager.java
rc/com/android/bluetooth/opp/BluetoothOppBatch.java
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppPreference.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommTransport.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/BluetoothOppShareInfo.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
rc/com/android/bluetooth/opp/BluetoothOppUtility.java
rc/com/android/bluetooth/opp/BluetoothPinDialog.java
rc/com/android/bluetooth/pbap/BluetoothPbapReceiver.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
464d9d216ab1a6cf192e3e526596073c7e35e4a7 13-Aug-2009 L.X.YUE <L.X.YUE@motorola.com> Update Opp icons

Update incomming file notification icon to be consistent with system;
Update OPP launcher icon per Anroid guidline;
es/drawable/bt_incomming_file_notification.png
es/drawable/bt_share.png
es/drawable/stat_sys_data_bt.png
rc/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
52236de777c23788df8147de15912a57e8bc36dd 04-Aug-2009 Tao Liejun <L.J.Tao@motorola.com> Fix a few OPP issues

Grab wakelock for server session
Fix send small file bug
rc/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/opp/Constants.java
d65cd7f65d0ba827c94cb9a6c1ef8343b6982d9d 06-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20085

* changes:
Update PBAP per review comments:
d896162ef022a5607b13bae5177637ff3f18b737 28-Jul-2009 Lixin Yue <L.X.YUE@motorola.com> Update PBAP per review comments:

Patch 3 fix listing call-history issue
Remove the use of Enum in PbapObexServer.java
Simplify codes by using function and paras
Change some informal usage in codes
Fix minor issues
Rename some function and vars
ndroidManifest.xml
es/values/strings_pbap.xml
rc/com/android/bluetooth/pbap/BluetoothPbapActivity.java
rc/com/android/bluetooth/pbap/BluetoothPbapAuthenticator.java
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapReceiver.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
ba7be3330e599ad1599b52221428d2af2dde8e84 04-Aug-2009 Jaikumar Ganesh <jaikumar@google.com> Set LOCAL_MODULE_TAG for packages/app/Bluetooth to user like other apps.
ndroid.mk
239bc526513429995c61c4148c105725c395b1a9 27-Jul-2009 Jackson Fan <xyfan@motorola.com> Enable Opp Livefolder, modify localizable resource

Update on patchset 2
Update icon for Bluetooth share and Incoming file
Fix minor Opp UI issue
Update log print for mimetype got from android system.
Update return response code for un-supported media type
Patchset 1
remove the use of replace() of localizable resource
Enable Opp Livefolder by using local certificate
Reject vcard actively
ndroid.mk
ndroidManifest.xml
ndroidManifest_test.xml
es/drawable/bt_share.png
es/drawable/stat_sys_data_bt.png
es/layout/file_transfer.xml
es/values/strings.xml
rc/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
rc/com/android/bluetooth/opp/BluetoothOppLiveFolder.java
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
rc/com/android/bluetooth/opp/BluetoothOppProvider.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
rc/com/android/bluetooth/opp/Constants.java
37b69bd05e4b7a7d0e43575a6c22734b2d8c3f69 24-Jul-2009 Jackson Fan <xyfan@motorola.com> Remove TODOs for frameworks change

Modify for aidl added in frameworks
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
87f9a72cc2d9544f65eab18893f7dc0de4f6ee31 23-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> Disable verbose logging.

TODO: We need to fix logging according to new verbose logging in OPP and PBAP.
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/Constants.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
b9cd7fee03a41e56a0cea9aa2e1af3b28c5be590 23-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> Add copyright and fix some style issues.
es/values/strings_pbap.xml
rc/com/android/bluetooth/pbap/BluetoothPbapActivity.java
rc/com/android/bluetooth/pbap/BluetoothPbapAuthenticator.java
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapReceiver.java
rc/com/android/bluetooth/pbap/BluetoothPbapRfcommTransport.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
2c282d5898ac0916470ebfa9ff26ba784cf4bb24 18-Jul-2009 Jackson Fan <xyfan@motorola.com> Add pbap into bluetooth package

Update PBAP as patchset 5
Adjust some resouces strings after UI test
Change localized resource usage
Modify exception handle, rename a confusing variable name
Remove compile dependency on 240 for now. Add TODO in code
Some minor changes to address the comments
Submit on-behalf of Yue Lixin <a5206c@motorola.com>

Update PBAP as patchset 4 according to comments
Format resource files
Re-organize the logs
Submit on-behalf of Jiafa Liu <pbx376@motorola.com>
ndroidManifest.xml
es/layout/access.xml
es/layout/auth.xml
es/values/strings_pbap.xml
rc/com/android/bluetooth/pbap/BluetoothPbapActivity.java
rc/com/android/bluetooth/pbap/BluetoothPbapAuthenticator.java
rc/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
rc/com/android/bluetooth/pbap/BluetoothPbapReceiver.java
rc/com/android/bluetooth/pbap/BluetoothPbapRfcommTransport.java
rc/com/android/bluetooth/pbap/BluetoothPbapService.java
rc/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
eb37b3c2c9d59bc1c0f09f911f5bde077a63f4da 18-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> Rename cancelPin to cancelPairingUserInput for Bluetooth 2.1
rc/com/android/bluetooth/opp/BluetoothPinDialog.java
af9af3c451fde7712e86c9430169c306b91836a4 15-Jul-2009 Jackson Fan <xyfan@motorola.com> Cleanup resources of OPP

Modify according to Ranian's comments
- adjust layout
- remove Capitalized resource names
- format
es/layout/bluetooth_pin_entry.xml
es/layout/bt_enabling_progress.xml
es/layout/confirm_dialog.xml
es/layout/file_transfer.xml
es/layout/preference_progress_category.xml
es/layout/testactivity_main.xml
es/values/strings.xml
es/values/test_strings.xml
rc/com/android/bluetooth/opp/TestActivity.java
df7415da0e510ab8e4b73831a5ade38306982fe1 16-Jul-2009 Tao Liejun <L.J.Tao@motorola.com> Fix OPP receive bug

Fix the bug that second receving would fail
Show display name instead of full name in notification
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
6769b59d715ea98bd72eafcfea9acd2714a887da 15-Jul-2009 Tao Liejun <L.J.Tao@motorola.com> Make opp compile

Modify to make opp application compliable in new git
-change package name
-change manifest
-modify a few comments
ndroid.mk
ndroid.mk.hide
ndroidManifest.xml
rc/com/android/bluetooth/opp/BluetoothDevicePickerActivity.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerBtStatus.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerDevice.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerDeviceManager.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerDevicePreference.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerManager.java
rc/com/android/bluetooth/opp/BluetoothOppBatch.java
rc/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java
rc/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java
rc/com/android/bluetooth/opp/BluetoothOppBtErrorActivity.java
rc/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
rc/com/android/bluetooth/opp/BluetoothOppLiveFolder.java
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
rc/com/android/bluetooth/opp/BluetoothOppPreference.java
rc/com/android/bluetooth/opp/BluetoothOppProvider.java
rc/com/android/bluetooth/opp/BluetoothOppReceiveFileInfo.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/BluetoothOppShareInfo.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
rc/com/android/bluetooth/opp/BluetoothOppUtility.java
rc/com/android/bluetooth/opp/BluetoothPinDialog.java
rc/com/android/bluetooth/opp/BluetoothShare.java
rc/com/android/bluetooth/opp/Constants.java
rc/com/android/bluetooth/opp/ProgressCategory.java
rc/com/android/bluetooth/opp/TestActivity.java
rc/com/android/bluetooth/opp/TestTcpListener.java
rc/com/android/bluetooth/opp/TestTcpServer.java
rc/com/android/bluetooth/opp/TestTcpSessionNotifier.java
09e9cba205af60b3f42e7a4d891a7d1392e1f2a5 11-Jul-2009 Nick Pelly <npelly@google.com> Initial drop of Motorola Bluetooth OPP code.

Minor changes from Moto code:
- Added Motorola BSD license
- Moved com.motorola.bluetoothshare to com.android.bluetooth.opp
- Updated com.motorola.obex to javax.obex
- Moved Android.mk to Android.mk.hide: does not yet compile due to changes in
Obex library.
ndroid.mk.hide
ndroidManifest.xml
ndroidManifest_test.xml
es/drawable/ic_bt_cellphone.png
es/drawable/ic_bt_laptop.png
es/drawable/icon.png
es/drawable/stat_sys_data_bt.png
es/layout/bluetooth_pin_entry.xml
es/layout/bt_enabling_progress.xml
es/layout/confirm_dialog.xml
es/layout/device_picker.xml
es/layout/file_transfer.xml
es/layout/main.xml
es/layout/preference_bluetooth.xml
es/layout/preference_progress_category.xml
es/layout/status_bar_ongoing_event_progress_bar.xml
es/layout/testactivity_main.xml
es/values/strings.xml
es/values/test_strings.xml
rc/com/android/bluetooth/opp/BluetoothDevicePickerActivity.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerBtStatus.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerDevice.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerDeviceManager.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerDevicePreference.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerListener.java
rc/com/android/bluetooth/opp/BluetoothDevicePickerManager.java
rc/com/android/bluetooth/opp/BluetoothOppBatch.java
rc/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java
rc/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java
rc/com/android/bluetooth/opp/BluetoothOppBtErrorActivity.java
rc/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
rc/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
rc/com/android/bluetooth/opp/BluetoothOppLiveFolder.java
rc/com/android/bluetooth/opp/BluetoothOppManager.java
rc/com/android/bluetooth/opp/BluetoothOppNotification.java
rc/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
rc/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
rc/com/android/bluetooth/opp/BluetoothOppObexSession.java
rc/com/android/bluetooth/opp/BluetoothOppPreference.java
rc/com/android/bluetooth/opp/BluetoothOppProvider.java
rc/com/android/bluetooth/opp/BluetoothOppReceiveFileInfo.java
rc/com/android/bluetooth/opp/BluetoothOppReceiver.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
rc/com/android/bluetooth/opp/BluetoothOppRfcommTransport.java
rc/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
rc/com/android/bluetooth/opp/BluetoothOppService.java
rc/com/android/bluetooth/opp/BluetoothOppShareInfo.java
rc/com/android/bluetooth/opp/BluetoothOppTransfer.java
rc/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
rc/com/android/bluetooth/opp/BluetoothOppTransferInfo.java
rc/com/android/bluetooth/opp/BluetoothOppUtility.java
rc/com/android/bluetooth/opp/BluetoothPinDialog.java
rc/com/android/bluetooth/opp/BluetoothShare.java
rc/com/android/bluetooth/opp/Constants.java
rc/com/android/bluetooth/opp/ProgressCategory.java
rc/com/android/bluetooth/opp/TestActivity.java
rc/com/android/bluetooth/opp/TestTcpListener.java
rc/com/android/bluetooth/opp/TestTcpServer.java
rc/com/android/bluetooth/opp/TestTcpSessionNotifier.java
rc/com/android/bluetooth/opp/TestTcpTransport.java
0756299082f38134b9a9dfae3fd09408bf62e071 11-Jul-2009 The Android Open Source Project <initial-contribution@android.com> new project, first commit