summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix setPairingConfirmation permissions issue (1/2)stable/cm-12.1-YOG4PAjay Panicker2016-11-161-2/+2
| | | | | | | | | | | | | setPairingConfirmation was set to only require BLUETOOTH_ADMIN permission which shouldn't be able to set the confirmation itself. This is restricted to BLUETOOTH_PRIVILEGED permission. CYNGNOS-3303 Bug: 29043989 Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa (cherry picked from commit 554f13336ef3e9b96f7e912c562935903bc6be75) (cherry picked from commit e7095a79e346d99036386c09063a288660cf6ba3)
* Add guest mode functionality (3/3)Ajay Panicker2016-07-083-7/+8
| | | | | | | | | | | | | Add a flag to enable() to start Bluetooth in restricted mode. In restricted mode, all devices that are paired during restricted mode are deleted upon leaving restricted mode. Right now restricted mode is only entered while a guest user is active. CYNGNOS-3020 Bug: 27410683 Change-Id: If4a8855faf362d7f6de509d7ddc7197d1ac75cee (cherry picked from commit e1ca5cccd6c2b37f783aa0ee2d9371108ad5c855)
* Revert ""DO NOT MERGE" Add write SMS protection"Jessica Wagantall2016-06-142-6/+1
| | | | | | | CYNGNOS-3020 This reverts commit 15e2d38086db1419c3072a509e02ca62a6446825. Change-Id: Ic7bde784cd961f41f3df5dfe1d2bac483553ab80
* "DO NOT MERGE" Add write SMS protectionJessica Wagantall2016-06-132-1/+6
| | | | | | | Bug: 25138326 Ticket: CYNGNOS-2707 Change-Id: I494db57e9291fac108e2abae85db367992ad81a1 (cherry picked from commit fd7a794fc57e06606244b9fc1673c9c549cce5c4)
* Automatic translation importAbhisek Devkota2016-06-13129-15/+2690
| | | | | Change-Id: Icd34148444095c78d21f34e93d4dc8390443ef15 Ticket: RM-154
* Bluetooth: split out AVRCP remote interfaces (2/2)Roman Birg2016-05-041-7/+19
| | | | | | | | | | | | | | android.media.cts.RemoteControllerTest#testOnClientUpdateListenerUnchanged will fail because it expects no extra methods to be added to the listeners and the current AVRCP impl simply appended methods to that listener. In 13 this was fixed by creating a separate listener for those callbacks. Backport that listener to fix the test. Ticket: HAM-1300 CYNGNOS-2716 Change-Id: I063cc5c121beada981d5b97b3052acd6638e3a9a Signed-off-by: Roman Birg <roman@cyngn.com> (cherry picked from commit 5aaa6203f124676957bf7acbc0d310d9b17f18fd)
* BluetoothMapContentObserver: Adding missing stringsJessica Wagantall2016-03-071-2/+3
| | | | Change-Id: I1edf600acd0057142dfb91b8a5f15118fbae9072
* BluetoothMapContentObserver: Adding missing includesJessica Wagantall2016-03-071-0/+3
| | | | Change-Id: I933c34a3861c97719cc8dfcf234c0c90cd7dfead
* Merge tag 'android-5.1.1_r35' into HEADJessica Wagantall2016-03-071-1/+69
|\ | | | | | | | | | | | | Android 5.1.1 release 35 Change-Id: I5126615a8ec0b2bf8d392ce02f6721617f77185e Ticket: CYNGNOS-1854
| * DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issueAndre Eisenbach2016-01-221-1/+77
| | | | | | | | | | | | | | | | | | | | Receive and handle ACTION_MESSAGE_SENT intent for SMS type message to move it to SENT folder when pushMessage request from MCE is processed and SMS delivered successfully. Bug: 22343270 CRs-Fixed: 903561 Change-Id: I9dafffc737a34233ede2d10e22cd969f520a12cf
| * DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMSMiao Chou2015-09-011-80/+14
| | | | | | | | | | | | | | | | | | This CL adds permission check to avoid unauthorized deletion of any MMS/SMS messages in BluetoothMapContentObserver.actionMessageSentDisconnected function. Bug: 22343270 Change-Id: I30254036309733be4d54db17a8ef17a571cd1c5a
* | res/values: Catch up with mainline on translation valuesJessica Wagantall2015-12-071-0/+22
| | | | | | | | | | | | RM-190 Change-Id: Iea5755f668f02b3bb438fca9651c4963d30377d8
* | DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMSMiao Chou2015-10-051-0/+11
| | | | | | | | | | | | | | | | | | | | This CL adds permission check to avoid unauthorized deletion of any MMS/SMS messages in BluetoothMapContentObserver.actionMessageSentDisconnected function. Bug: 22343270 Change-Id: I30254036309733be4d54db17a8ef17a571cd1c5a Ticket: CYNGNOS-985
* | Automatic translation importTom Powell2015-08-211-1/+1
| | | | | | | | | | Change-Id: I6efb65da5ca3496a19a128baab4673446d9f9b99 CYNGNOS-264
* | Automatic translation importMichael Bestas2015-07-283-0/+45
| | | | | | | | | | | | CYNGNOS-264 Change-Id: I73c753564c3a63cb86c21c61b3a57b5639c12e60 (cherry picked from commit 6ab1804e90fca7ff1559ec4d5d67e4f5550de477)
* | Automatic translation importMichael Bestas2015-07-281-0/+1
| | | | | | | | | | | | CYNGNOS-264 Change-Id: I509a039084e3c7378074f5b575f4d5577c697ad0 (cherry picked from commit b473fdb821cc35a9707145e949141e02f193550f)
* | Bluetooth: request audio focus on incoming callRoman Birg2015-06-171-0/+21
| | | | | | | | | | | | | | | | | | When the a2dp stream is suspended for an incoming call, request audio focus from the audio manager so that any playing media will pause/duck as needed. Change-Id: I308b697ad998b7167703ebc89c6285034ac1ebf9 Signed-off-by: Roman Birg <roman@cyngn.com>
* | Automatic translation importMichael Bestas2015-06-131-0/+22
| | | | | | | | Change-Id: I130ffb131d576e23badc3969414091b754db49d7
* | Automatic translation importMichael Bestas2015-06-091-0/+22
| | | | | | | | Change-Id: I3df33e1e65394e9aa6ce64f34c9f35d950081778
* | Automatic translation importMichael Bestas2015-05-241-1/+1
| | | | | | | | Change-Id: I9728f84d38a4466518afd2d7734e06dee761f97e
* | Automatic translation importMichael Bestas2015-05-163-0/+24
| | | | | | | | Change-Id: I6f7c2f76824884ef45f59b2548cc6d68988cf26b
* | Automatic translation importMichael Bestas2015-05-021-0/+22
| | | | | | | | Change-Id: I35504d3a4915d2369d1620d0d58953ade71c49a4
* | Bluetooth: fix StaleDataException when pairing with other devicestable/cm-12.1-YOG3CSzymon Pusz2015-04-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a crash when pairing for example with car audio that reads sms/mms FATAL EXCEPTION: BluetoothMnsObexClient Process: com.android.bluetooth, PID: 1944 android.database.StaleDataException: Attempted to access a cursor after it has been closed. at android.database.BulkCursorToCursorAdaptor.throwIfCursorIsClosed(BulkCursorToCursorAdaptor.java:64) at android.database.BulkCursorToCursorAdaptor.getCount(BulkCursorToCursorAdaptor.java:70) at android.database.AbstractCursor.moveToPosition(AbstractCursor.java:197) at android.database.AbstractCursor.moveToNext(AbstractCursor.java:245) at android.database.CursorWrapper.moveToNext(CursorWrapper.java:166) at com.android.bluetooth.map.BluetoothMapContentObserver.initMsgList(BluetoothMapContentObserver.java:405) at com.android.bluetooth.map.BluetoothMapContentObserver.registerObserver(BluetoothMapContentObserver.java:334) at com.android.bluetooth.map.BluetoothMnsObexClient.handleRegistration(BluetoothMnsObexClient.java:238) at com.android.bluetooth.map.BluetoothMnsObexClient$MnsObexClientHandler.handleMessage(BluetoothMnsObexClient.java:107) at android.os.Handler.dispatchMessage(Handler.java:102) at android.os.Looper.loop(Looper.java:135) at android.os.HandlerThread.run(HandlerThread.java:61) Change-Id: Idea00c396c2512480befbf262571c8d8242e4af7
* | Automatic translation importMichael Bestas2015-04-171-1/+1
| | | | | | | | Change-Id: Idf8ec9dcb0ff1f2a8138111d4d779bebd7929f5f
* | Automatic translation importMichael Bestas2015-04-172-0/+23
| | | | | | | | Change-Id: I617de6eedc9236b34bc90d8873c093d53eb8ff0e
* | Automatic translation importMichael Bestas2015-04-171-0/+22
| | | | | | | | Change-Id: Ie2675992cd5ba2d38202e46c658667e79837516e
* | Merge branch 'LA.BF64.1.2.1_rb2.6' of ↵Steve Kondik2015-04-0410-18/+81
|\ \ | | | | | | | | | git://codeaurora.org/platform/packages/apps/Bluetooth into cm-12.1
| * \ Merge AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.01.00.081.009 on remote branchLinux Build Service Account2015-03-230-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: Id8420b5eb4f5ff296ea5135f1dc81855b2ac7130
| | * \ Merge AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.01.00.081.006 on remote branchLinux Build Service Account2015-03-200-0/+0
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I32171ef516a93f8ee56f5883afb39555c690d2aa
| | | * | Bluetooth-OPP: Check socket congestion status before writing the dataJuffin Alex Varghese2015-03-172-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will ensure that data will be send to socket only after congestion is cleared. Otherwise, if socket is already in congestion and send the data before clearing, will cause transfer failure. CRs-Fixed: 790313 Change-Id: I8847a9f3473d97cd6fadf24e293ac179418df457
| | | * | Merge tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1.05.00.02.066.045' into HEADSudhir Sharma2015-03-166-14/+35
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AU_LINUX_ANDROID_LA.BF64.1.2.1.05.00.02.066.045 based on quic/aosp/LA.BF64.1.2.1 * tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1.05.00.02.066.045': Prevent duplicate OPP permission request dialogs Check previous user confirmation before auto-confirm put request updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it Bluetooth: Stopping all services in case of enable Timeout Bluetooth-OPP: Read share count from OPP manager before transfer starts Bluetooth: Fix to respond to Browse command when not supported Conflicts: src/com/android/bluetooth/opp/BluetoothOppService.java Change-Id: Ie183e464a61dd2c3ed39a6f683ec4bf1e98029a1
| * | | \ \ Merge "MAP: Fix parsing special character issue in vcard email."Linux Build Service Account2015-03-171-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | MAP: Fix parsing special character issue in vcard email.Ashwini Munigala2015-03-091-0/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace '<' for '&lt' and '>' for '&gt' while parsing email address in vcard pushed from some paticular carkits in MCE role. Change-Id: Id24d202a6a60b5edb2de11732527135a7542ecd2 CRs-fixed: 802930
| * | | | Merge "Merge tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002' into ↵Linux Build Service Account2015-03-1359-568/+1143
| |\ \ \ \ | | | | | | | | | | | | | | | | | | HEAD"
| | * | | | Merge tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002' into HEADSudhir Sharma2015-03-1259-568/+1143
| |/| | | | | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002" Conflicts: src/com/android/bluetooth/opp/BluetoothOppService.java Change-Id: Ib9af52d253cf33902a82552c821d8e14626d9f75
| * | | | Merge "Bluetooth: Avoid cleanup the scan manager if already cleaned up"Linux Build Service Account2015-03-121-4/+16
| |\ \ \ \
| | * | | | Bluetooth: Avoid cleanup the scan manager if already cleaned upSrinu Jella2015-03-111-4/+16
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Avoid cleanup the scan manager if already cleaned up, scan manager can be cleared on receiving the stop request or when the service is destroyed. - There is a case, where destroy and stop called one after the other, it will try to cleanup twice, that leads to crash. CRs-Fixed: 797597 Change-Id: I0adc5cb683bbf47f12598e6c54eae7df87cdbbc4
| * | | | Merge "Bluetooth-OPP: Check socket congestion status before writing the data"Linux Build Service Account2015-03-092-0/+29
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Bluetooth-OPP: Check socket congestion status before writing the dataJuffin Alex Varghese2015-03-032-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will ensure that data will be send to socket only after congestion is cleared. Otherwise, if socket is already in congestion and send the data before clearing, will cause transfer failure. CRs-Fixed: 790313 Change-Id: I8847a9f3473d97cd6fadf24e293ac179418df457
| * | | | Merge "Bluetooth: Stopping all services in case of enable Timeout"Linux Build Service Account2015-03-061-0/+1
| |\ \ \ \
| | * | | | Bluetooth: Stopping all services in case of enable TimeoutAjay Kumar2015-03-031-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are not stopping services in case of enable timeout while all profile services will stop only when we explicitly stop services. This will enable all services to cleanup properly and allocate resources for the fresh retrial. Change-Id: I6a2e4ba87bdbbcc6864f1e26964f6e55bfefc03b CRs-Fixed: 779057
| * | | | Merge "Prevent duplicate OPP permission request dialogs"Linux Build Service Account2015-03-051-1/+2
| |\ \ \ \
| | * | | | Prevent duplicate OPP permission request dialogsAndre Eisenbach2015-03-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When multiple files are sent in a single OPP session, the user should be prompted to accept/reject only once. Bug: 17770561 Change-Id: I438116915883c5fdc2d743f13456006f66511c0f
| * | | | | Merge "Check previous user confirmation before auto-confirm put request"Linux Build Service Account2015-03-053-12/+12
| |\| | | |
| | * | | | Check previous user confirmation before auto-confirm put requestMatthew Xie2015-03-053-12/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also correct a confirm status change check in updateShare. Bug: 17770561, 18343032 Conflicts: src/com/android/bluetooth/opp/BluetoothOppService.java Change-Id: I8e7d10e73604c0bf1c88801a1caef7d579fbd1eb
| * | | | Merge "updateshare confirm logic missed cases like CONFIRMATION_DENIED, ↵Linux Build Service Account2015-03-051-1/+3
| |\ \ \ \ | | |/ / / | |/| | | | | | | | TIMEOUT. fix it"
| | * | | updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix itMatthew Xie2015-03-031-1/+3
| |/ / / | | | | | | | | | | | | | | | | bug 17770561 Change-Id: I34fb018d9787b4deef8592c71f5539778e76e325
| * | | Merge "Bluetooth: Fix to respond to Browse command when not supported"Linux Build Service Account2015-03-011-1/+1
| |\ \ \
| | * | | Bluetooth: Fix to respond to Browse command when not supportedpramod kotreshappa2015-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send error response for GetFolderItem with NowPlaying scope AVRCP browse command sent by remote prior to SetBrowsedPlayer command. Change-Id: I878e71d5534e055a0d498317200ee13cbba878dd
| * | | | Merge "Bluetooth-OPP: Read share count from OPP manager before transfer starts"Linux Build Service Account2015-02-244-12/+30
| |\ \ \ \