summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix setPairingConfirmation permissions issue (1/2)stable/cm-12.1-YOG7DAjay 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 a19e04f9b78b13088f8c2d5d86c6b416afa0c81b. Change-Id: I1debdc816ddefcfb1a7e6e196cc0dba7c4b426a5
* "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-05-23129-4/+2614
| | | | | Change-Id: I04b7d8d69ca551e3d4b631efa2e93842dc88115c Ticket: RM-170
* 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)
* Automatic translation importMichael Bestas2016-03-171-2/+2
| | | | | Ticket: YAM-21 Change-Id: I15e2a4f91d1eb03b0e640cc316b201436d0034df
* Automatic translation importMichael Bestas2016-03-171-1/+1
| | | | | Ticket: YAM-21 Change-Id: I502ae7b91bf0fbce41a4d69d7f3a728e1e3316c6
* Automatic translation importMichael Bestas2016-03-112-0/+44
| | | | | | Ticket: YAM-21 Change-Id: I55ea886c3cf5de53fd96eafb8f3a39b28e96cf61 (cherry picked from commit a3df5c0ceee56506b6d04d0cdee3262df9aed26d)
* Merge tag 'android-5.1.1_r35' into HEADJessica Wagantall2016-03-071-0/+72
|\ | | | | | | | | | | | | Android 5.1.1 release 35 Ticket: CYNGNOS-1854 Change-Id: Ie3459f5cfc33cd5e68fc776c296b3a7412893f8b
| * 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
* | Automatic translation importMichael Bestas2016-01-131-0/+22
| | | | | | | | | | Ticket: YAM-21 Change-Id: Ia38b0926d1c85c3ac85a862c1c84d3fc1780c119
* | Automatic translation importMichael Bestas2016-01-134-0/+25
| | | | | | | | | | Ticket: YAM-21 Change-Id: I38c43a046f6be22052a732073467b9a53e3f10f2
* | Automatic translation importMichael Bestas2016-01-133-4/+25
| | | | | | | | | | Ticket: YAM-21 Change-Id: Ibceee5a7833159d3de36ab3c5e25a861f817e978
* | Automatic translation importMichael Bestas2016-01-133-45/+0
| | | | | | | | | | Ticket: YAM-21 Change-Id: I56f37ec168797e7213e3a7b3e2fa6f81bca847c3
* | Automatic translation importMichael Bestas2016-01-131-0/+1
| | | | | | | | | | Ticket: YAM-21 Change-Id: Ieda771cc9b160b12e151d855a627c6eada8c2f3c
* | Merge remote-tracking branch 'remotes/github/cm-12.1' into HEADJessica Wagantall2015-10-145-3/+23
|\ \ | | | | | | | | | | | | | | | Issue-Id: RM-170 Change-Id: Idf63e919e022fc5b9ee3248d2d69dd43aec777ca
| * | Automatic translation importMichael Bestas2015-10-121-0/+1
| | | | | | | | | | | | Change-Id: I7777a737040a33bd81c7df0225ed48fc35dc8a95
| * | Merge tag 'android-5.1.1_r23' into cm-12.1Ricardo Cerqueira2015-10-051-0/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 5.1.1 release 23 Conflicts: src/com/android/bluetooth/map/BluetoothMapContentObserver.java Change-Id: Idb110d4cec541c9adadfee672fe5f869e6ee9926
| | * | 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
| | * | merge in lmp-mr1-nova-release history after reset to lmp-mr1-devThe Android Automerger2015-02-190-0/+0
| | |\ \ | | | |/ | | |/|
| | | * merge in lmp-mr1-nova-release history after reset to lmp-mr1-devThe Android Automerger2015-02-110-0/+0
| | | |\
| | | | * merge in lmp-mr1-nova-release history after reset to lmp-mr1-devThe Android Automerger2015-01-280-0/+0
| | | | |\
| | | | | * merge in lmp-mr1-nova-release history after reset to lmp-mr1-devThe Android Automerger2015-01-260-0/+0
| | | | | |\
| | | | | | * merge in lmp-mr1-nova-release history after reset to lmp-mr1-devThe Android Automerger2015-01-160-0/+0
| | | | | | |\
| | | | | | | * merge in lmp-mr1-nova-release history after reset to lmp-mr1-devThe Android Automerger2015-01-070-0/+0
| | | | | | | |\
| | | | | | | | * merge in lmp-mr1-nova-release history after reset to lmp-mr1-devThe Android Automerger2015-01-020-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in lmp-mr1-nova-release history after reset to lmp-mr1-devThe Android Automerger2015-01-020-0/+0
| | | | | | | | | |\ | | | | | | | | | |/ | | | | | | | | |/|
| * | | | | | | | | Automatic translation importMichael Bestas2015-09-244-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic178645c0112925daed95220bf47a22e169a4db3
* | | | | | | | | | 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 (cherry picked from commit 36794e64e0cca17fdcfc5af989e978592aa572f5)
* | | | | | | | | Automatic translation importMichael Bestas2015-09-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia6e2253b9fd09357ec8f1adfdeb50e80dfa5b100
* | | | | | | | | Automatic translation importTom Powell2015-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6efb65da5ca3496a19a128baab4673446d9f9b99
* | | | | | | | | Automatic translation importMichael Bestas2015-07-273-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I73c753564c3a63cb86c21c61b3a57b5639c12e60
* | | | | | | | | Automatic translation importMichael Bestas2015-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I509a039084e3c7378074f5b575f4d5577c697ad0
* | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 14:30:37 +0000