OSDN Git Service
Ajay Panicker [Tue, 6 Dec 2016 02:49:56 +0000 (02:49 +0000)]
Remove MANAGE_DOCUMENTS permission as it isn't needed
am:
c37f27194b
Change-Id: I60c7f1ac1f5263751882b93bd20635bca05aba10
Ajay Panicker [Thu, 17 Nov 2016 23:50:36 +0000 (15:50 -0800)]
Remove MANAGE_DOCUMENTS permission as it isn't needed
Bug:
32612586
Change-Id: Iebe7dc9b198ce99d5921f5a349ba9d5d4424d156
TreeHugger Robot [Wed, 21 Sep 2016 00:52:46 +0000 (00:52 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev
Ajay Panicker [Wed, 21 Sep 2016 00:37:40 +0000 (00:37 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours" into lmp-dev
am:
60b2ea959d -s ours
Change-Id: Id90024c2155db8b9da83feecf4dddf370e3c610f
Ajay Panicker [Wed, 21 Sep 2016 00:36:35 +0000 (00:36 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours
am:
1a3a6accdc -s ours
Change-Id: I031461f1073654ffa42a7c2e1fb934631374bc88
Ajay Panicker [Wed, 21 Sep 2016 00:12:22 +0000 (00:12 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
am:
554f13336e -s ours
Change-Id: I3eafa8236429c8ba5ba54ee5464e3f0fd1622bb7
Android Build Merger (Role) [Wed, 21 Sep 2016 00:05:40 +0000 (00:05 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours" into lmp-dev
Ajay Panicker [Wed, 21 Sep 2016 00:04:38 +0000 (00:04 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898
am:
77a38cb641 -s ours
Change-Id: I93e490e6f7ff7ca24e0ef5a321565db21a08f9a4
Ajay Panicker [Tue, 20 Sep 2016 23:56:57 +0000 (23:56 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8
am:
2c3e8b5898
Change-Id: Iddbee8b99be3c4e5c4305d9172ef7f23880a12f6
Ajay Panicker [Thu, 8 Sep 2016 17:55:51 +0000 (10:55 -0700)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/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.
Bug:
29043989
Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa
Ajay Panicker [Tue, 20 Sep 2016 23:49:08 +0000 (23:49 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
am:
3ccc668ff8
Change-Id: I5932ce563c8858824a6aa8732f13aecb00d9099e
Ajay Panicker [Thu, 8 Sep 2016 17:55:51 +0000 (10:55 -0700)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/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.
Bug:
29043989
Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa
Ajay Panicker [Thu, 8 Sep 2016 17:55:51 +0000 (10:55 -0700)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/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.
Bug:
29043989
Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa
Ajay Panicker [Tue, 24 May 2016 22:02:02 +0000 (22:02 +0000)]
Add guest mode functionality (3/3)
am:
e1ca5cccd6
* commit '
e1ca5cccd6c2b37f783aa0ee2d9371108ad5c855':
Add guest mode functionality (3/3)
Change-Id: I9f3c034215aadf5e5ebd77e4a3265c7fbcf21fe3
Ajay Panicker [Fri, 18 Mar 2016 00:12:08 +0000 (17:12 -0700)]
Add guest mode functionality (3/3)
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.
Bug:
27410683
Change-Id: If4a8855faf362d7f6de509d7ddc7197d1ac75cee
Ajay Panicker [Tue, 19 Apr 2016 20:23:20 +0000 (20:23 +0000)]
"DO NOT MERGE" Add write SMS protection
am:
fd7a794 -s ours
* commit '
fd7a794fc57e06606244b9fc1673c9c549cce5c4':
"DO NOT MERGE" Add write SMS protection
Change-Id: I3dcb78c9213b10ad354c72ab756af773c04213c7
Ajay Panicker [Wed, 6 Apr 2016 22:55:15 +0000 (15:55 -0700)]
"DO NOT MERGE" Add write SMS protection
Bug:
25138326
Change-Id: I494db57e9291fac108e2abae85db367992ad81a1
Andre Eisenbach [Tue, 12 Jan 2016 18:52:47 +0000 (18:52 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36
am:
6e9165b908 -s ours
* commit '
6e9165b90881581d1c58eb974b304465340b08e7':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 18:46:52 +0000 (18:46 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
am:
abb54d6d36
* commit '
abb54d6d3614cd86a6349303400b9cf2f83af4c7':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 29 Dec 2015 21:37:08 +0000 (13:37 -0800)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
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
Miao Chou [Sat, 8 Aug 2015 00:44:53 +0000 (00:44 +0000)]
am
0a268209: am
6b58105c: am
75d042a4: (-s ours) am
ef9b774c: am
0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
0a268209aec6f988b1ef2a60c1e7a2c0130c7ee0':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:36:53 +0000 (00:36 +0000)]
am
6b58105c: am
75d042a4: (-s ours) am
ef9b774c: am
0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
6b58105c04abdfb2e8aa0f198b41c4c5a9f35d20':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:27:52 +0000 (00:27 +0000)]
am
75d042a4: (-s ours) am
ef9b774c: am
0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
75d042a4c53c09f82b4a95cf82ded21ffbcb017f':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:23:30 +0000 (00:23 +0000)]
am
ef9b774c: am
0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
ef9b774c992cbff61502a3eb6c680862db26a468':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:23:15 +0000 (00:23 +0000)]
am
46f1dd6d: am
19004c75: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
46f1dd6d20d4108a44f06137a176d6548c6a0ac6':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:17:47 +0000 (00:17 +0000)]
am
0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
0f6aaa5a945345b273bce16429c5ac56f3d1e7a9':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:16:42 +0000 (00:16 +0000)]
am
19004c75: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
19004c751f36aa2b01d3e03d4f761d8897542bd2':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Mon, 20 Jul 2015 19:14:25 +0000 (12:14 -0700)]
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
This CL adds permission check to avoid unauthorized deletion of any MMS/SMS
messages in BluetoothMapContentObserver.actionMessageSentDisconnected
function.
Bug:
22343270
Change-Id: I30254036309733be4d54db17a8ef17a571cd1c5a
Miao Chou [Mon, 20 Jul 2015 19:14:25 +0000 (12:14 -0700)]
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
This CL adds permission check to avoid unauthorized deletion of any MMS/SMS
messages in BluetoothMapContentObserver.actionMessageSentDisconnected
function.
Bug:
22343270
Change-Id: I30254036309733be4d54db17a8ef17a571cd1c5a
Amit Mahajan [Thu, 19 Feb 2015 02:39:40 +0000 (18:39 -0800)]
Adding a new param to calculateLength for SMS to indicate if called for a
segment of multipart msg.
Encoding type is calculated separately for entire msg vs individual
segments. Change is to avoid overwriting the calculated value for
individual segment based.
Bug:
19399335
Change-Id: I8e89b7596e9c7440ace0486eceb1252094c373fa
Andre Eisenbach [Fri, 6 Feb 2015 04:07:50 +0000 (20:07 -0800)]
Add API to check if a Bluetooth connection is encrypted (2/2)
Bug:
19186961
Change-Id: Ied8dbe60995ebe8759c2a4ce21f373b597ed3afe
Matthew Xie [Fri, 23 Jan 2015 22:51:46 +0000 (14:51 -0800)]
Use LTE signal level when under LTE
Bug:
17898918
Change-Id: I9f3bb8d874e24440c2b8de85a6a0d7dbdadb3935
Andre Eisenbach [Tue, 20 Jan 2015 23:18:19 +0000 (23:18 +0000)]
Merge "Remove GATT context if client registration did not succeed" into lmp-mr1-dev
Andre Eisenbach [Fri, 16 Jan 2015 21:02:48 +0000 (13:02 -0800)]
Remove GATT context if client registration did not succeed
Bug:
19028495
Change-Id: I25827e365621fa9b3ef6e85ef9c103cf03654b7c
Andre Eisenbach [Thu, 15 Jan 2015 23:36:55 +0000 (23:36 +0000)]
Merge "Improve VCARD filter logic and reduce log spam" into lmp-mr1-dev
Wink Saville [Tue, 13 Jan 2015 19:02:24 +0000 (19:02 +0000)]
Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
Wink Saville [Tue, 13 Jan 2015 00:50:32 +0000 (16:50 -0800)]
Rename reg/unreg OnSubscriptionsChangedListener.
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.
Bug:
18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
Andre Eisenbach [Wed, 7 Jan 2015 22:25:19 +0000 (14:25 -0800)]
Improve VCARD filter logic and reduce log spam
Remove a stray log message in VCardFilter.applyFilter() function that
leads to high-frequency log spam during phone book synchronization. Also
refactored the logic to avoid multiple loops & loop iterations causing
higher CPU load.
Bug:
18913091
Change-Id: I3c6d3c3373d4a74a930d182ee2641959461b0556
Wei Wang [Fri, 9 Jan 2015 22:39:35 +0000 (14:39 -0800)]
Fix Bluetooth crash when all filters are used.
Bug:
18963121
Change-Id: Ia69ad697d5be5b0a5e076f33e513aa2698a7468c
Andre Eisenbach [Thu, 18 Dec 2014 22:33:38 +0000 (22:33 +0000)]
Merge "Add EventLog for configHciSnoopLog() security check" into lmp-mr1-dev
Andre Eisenbach [Wed, 17 Dec 2014 21:45:18 +0000 (13:45 -0800)]
Add EventLog for configHciSnoopLog() security check
Bug:
18643224
Change-Id: I9c3f5e0880310e02a187d88349c5624bdade42eb
Andre Eisenbach [Wed, 17 Dec 2014 16:55:57 +0000 (16:55 +0000)]
Merge "Enforce BLUETOOTH_PRIVILEGED permission for HID-over-GATT" into lmp-mr1-dev
Santos Cordon [Wed, 17 Dec 2014 16:21:05 +0000 (16:21 +0000)]
Merge "Allow system process to interact with Bluetooth across users." into lmp-mr1-dev
Andre Eisenbach [Tue, 16 Dec 2014 21:43:52 +0000 (13:43 -0800)]
Enforce BLUETOOTH_PRIVILEGED permission for HID-over-GATT
Bug:
18359172
Change-Id: I06ed22af9dab8129ba7668dadd5b988d63c8a527
Santos Cordon [Tue, 16 Dec 2014 18:02:44 +0000 (10:02 -0800)]
Allow system process to interact with Bluetooth across users.
Bug:
18688307
Change-Id: If31703fbe515baa40c242f99a61479a1ec8152b1
Andre Eisenbach [Tue, 16 Dec 2014 19:46:34 +0000 (19:46 +0000)]
Merge "Prevent possible NullPointerException when service is destroyed" into lmp-mr1-dev
Andre Eisenbach [Tue, 16 Dec 2014 16:58:43 +0000 (08:58 -0800)]
Prevent possible NullPointerException when service is destroyed
Bug:
18757778
Change-Id: Iaf2c8e41a5733379d171f58a35d09c506080fe5d
Andre Eisenbach [Tue, 16 Dec 2014 16:43:23 +0000 (16:43 +0000)]
Merge "Prevent duplicate OPP permission request dialogs" into lmp-mr1-dev
Andre Eisenbach [Tue, 16 Dec 2014 01:59:25 +0000 (17:59 -0800)]
Prevent non-system users from enabling Bluetooth HCI logging
Bug:
18643224
Change-Id: I990aa3dac478d332f565496d0353c9677ea85d46
Andre Eisenbach [Sun, 14 Dec 2014 20:22:31 +0000 (12:22 -0800)]
Prevent duplicate OPP permission request dialogs
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
Wink Saville [Fri, 12 Dec 2014 04:23:13 +0000 (04:23 +0000)]
Merge "Rename isValidSubId to isValidSubscriptionid." into lmp-mr1-dev
Kim Schulz [Wed, 10 Dec 2014 20:51:46 +0000 (12:51 -0800)]
Prevent Cursor leakage in Bluetooth MAP
Bug:
18415378
Change-Id: Id513ee848dd21c641d77be38bdc6be85b5ef87a8
Wink Saville [Thu, 11 Dec 2014 18:09:43 +0000 (10:09 -0800)]
Rename isValidSubId to isValidSubscriptionid.
Bug:
18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
Andre Eisenbach [Tue, 9 Dec 2014 17:02:53 +0000 (17:02 +0000)]
Merge "Remove missing object to avoid NPE" into lmp-mr1-dev
Wei Wang [Mon, 8 Dec 2014 19:26:49 +0000 (11:26 -0800)]
Fix timestamp parsing issue for full scan results.
Bug:
18663523
Change-Id: If0ba083125d75e857072519fc7d6226a4db0273a
Jason Monk [Mon, 8 Dec 2014 14:01:21 +0000 (14:01 +0000)]
Merge "Allow SystemUI access to bluetooth from user 0" into lmp-mr1-dev
Prem Kumar [Mon, 8 Dec 2014 05:57:55 +0000 (05:57 +0000)]
Merge "Revert "Bluetooth: Added Shared Preferences to restore tethering preference"" into lmp-mr1-dev
Jason Monk [Fri, 5 Dec 2014 18:01:51 +0000 (13:01 -0500)]
Allow SystemUI access to bluetooth from user 0
SystemUI always runs in the owner user, so when a secondary user
if foreground we need a special case to allow it access to bluetooth.
Bug:
18151285
Change-Id: I555dc2e4b4ff4929f9796fb888dd845fd066b368
Benjamin Franz [Fri, 5 Dec 2014 12:04:19 +0000 (12:04 +0000)]
Merge "Allow managed profile apps to use some bluetooth functionality." into lmp-mr1-dev
Matthew Xie [Thu, 4 Dec 2014 08:05:30 +0000 (08:05 +0000)]
Merge "Nullpointer check on mAdapterService in ProfileService#onCreate" into lmp-mr1-dev
Matthew Xie [Thu, 4 Dec 2014 00:52:37 +0000 (16:52 -0800)]
Nullpointer check on mAdapterService in ProfileService#onCreate
Bug:
18595130
Change-Id: I02d588dab94e1dc6c24402259e5b8cea2a98b482
Matthew Xie [Wed, 3 Dec 2014 01:50:55 +0000 (17:50 -0800)]
Revert "Bluetooth: Added Shared Preferences to restore tethering preference"
This reverts commit
cdd2da9489cdfcf35ffdc622eba6f2155f6d376e.
Bug
18452422
Change-Id: I6039ab98038773691dce7667c53256fa04c51df9
Matthew Xie [Wed, 3 Dec 2014 21:42:23 +0000 (21:42 +0000)]
Merge "Turn off map debug verbose messages" into lmp-mr1-dev
Michal Labedzki [Fri, 31 Oct 2014 13:36:42 +0000 (14:36 +0100)]
Remove missing object to avoid NPE
Initialization of mContentView was removed in commit
addfd25b639047e8463772b14f249758bdb20fbc, but is still
referenced during timeout causing NPE. Remove reference
as it is not needed.
Bug:
18309654
Change-Id: Id42810a97d638fd761a32069b591fc2b647e3a67
Andre Eisenbach [Tue, 2 Dec 2014 21:48:18 +0000 (21:48 +0000)]
Merge "Add GATT debug information to dumpsys/bugreport" into lmp-mr1-dev
Andre Eisenbach [Tue, 2 Dec 2014 17:17:42 +0000 (09:17 -0800)]
Add GATT debug information to dumpsys/bugreport
Bug:
17894347
Change-Id: I70a2e237e4aa6a1057e5ff519f3f6148a27b3a98
Benjamin Franz [Wed, 5 Nov 2014 20:43:27 +0000 (20:43 +0000)]
Allow managed profile apps to use some bluetooth functionality.
Adding a function that checks whether the calling user is the foreground
user or a managed profile associated to this user. This function is
deployed in selected spots to give managed profile apps access to some
part of the bluetooth functionality including the HeadsetService.
Bug:
16968338
Change-Id: Ib0db0847cf361b449484195553725c38ede3b618
Andre Eisenbach [Tue, 2 Dec 2014 08:01:54 +0000 (08:01 +0000)]
Merge "Add server-side callback for change in MTU (3/4)" into lmp-mr1-dev
Matthew Xie [Mon, 1 Dec 2014 20:44:54 +0000 (12:44 -0800)]
Turn off map debug verbose messages
Still leave the debug messages on to provide some basic debug info
Bug:
18486776
Change-Id: I08fc5c69d9a128ec5ddc97203d02b82ced255262
Matthew Xie [Mon, 1 Dec 2014 20:01:17 +0000 (20:01 +0000)]
am
668467e0: am
bf75bdac: am
c9332240: am
845b549b: am
d9761c69: am
859909c0: am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
668467e070ea735e55aaa3fa4384f5d44dea2bc8':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:54:23 +0000 (19:54 +0000)]
am
bf75bdac: am
c9332240: am
845b549b: am
d9761c69: am
859909c0: am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
bf75bdaca1c044f9806b5cb5df7415ad57d20fb9':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:50:29 +0000 (19:50 +0000)]
am
c9332240: am
845b549b: am
d9761c69: am
859909c0: am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
c9332240afc6dd5422379a8c2208a1c438ef591f':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:44:06 +0000 (19:44 +0000)]
am
e4b62388: am
75a925e9: Merge "Check previous user confirmation before auto-confirm put request" into lmp-dev
* commit '
e4b62388082032bb0df535647819d95243abfab5':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:41:57 +0000 (19:41 +0000)]
am
845b549b: am
d9761c69: am
859909c0: am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
845b549b22fc861279a3c8fe2d4a83bad6f135d5':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:36:55 +0000 (19:36 +0000)]
am
d9761c69: am
859909c0: am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
d9761c692ffbc621460054ad2f034557ad330b7d':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:31:34 +0000 (19:31 +0000)]
am
859909c0: am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
859909c048c3477ea47d8dba50f025b8fbf13c90':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:26:52 +0000 (19:26 +0000)]
am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
33cbe67533f97c2e819a84ed6b6950bdd7639749':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:03:09 +0000 (19:03 +0000)]
am
75a925e9: Merge "Check previous user confirmation before auto-confirm put request" into lmp-dev
* commit '
75a925e98f895d59a612a5f96050845f3553dd25':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 18:55:34 +0000 (18:55 +0000)]
Merge "Check previous user confirmation before auto-confirm put request" into lmp-dev
Andre Eisenbach [Wed, 26 Nov 2014 20:57:58 +0000 (12:57 -0800)]
Add server-side callback for change in MTU (3/4)
When a client requests to update the LE transport MTU, the server
currently does not get notified and can therefor not properly size
notifications appropriate to the current MTU.
Bug:
18388114
Change-Id: Ie075871cbc643bd3840e9ab472706f1565b74467
Matthew Xie [Wed, 26 Nov 2014 00:59:40 +0000 (00:59 +0000)]
am
fcd9bd0d: DO NOT MERGE Move wake alarm setting and releasing into AdapterService\'s handler
* commit '
fcd9bd0d130f1050aa7e68c65f1595ef8fc24e68':
DO NOT MERGE Move wake alarm setting and releasing into AdapterService's handler
Matthew Xie [Tue, 25 Nov 2014 23:19:51 +0000 (15:19 -0800)]
DO NOT MERGE Move wake alarm setting and releasing into AdapterService's handler
The setting and firing of the alarm wake lock came from different thread
and cause deadlock.
Note: not merging down into MR1 so that further testing can be done.
Bug:
18511282
Change-Id: I32b18cb21d503f10a8e49b1e86c949ebe96b3482
Matthew Xie [Mon, 24 Nov 2014 23:56:46 +0000 (23:56 +0000)]
am
2f65cee9: am
38a952fe: am
b16b868d: am
d4a6ad3a: am
d981ab06: Check previous user confirmation before auto-confirm put request
* commit '
2f65cee9a3058a183c67f95571aa1dda7077112f':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 24 Nov 2014 23:49:48 +0000 (23:49 +0000)]
am
38a952fe: am
b16b868d: am
d4a6ad3a: am
d981ab06: Check previous user confirmation before auto-confirm put request
* commit '
38a952fe66d78602095ab65ef36f321e99c295a6':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 24 Nov 2014 23:35:30 +0000 (23:35 +0000)]
am
b16b868d: am
d4a6ad3a: am
d981ab06: Check previous user confirmation before auto-confirm put request
* commit '
b16b868dc8df463e688069870d6f53ae17ecdaa8':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 24 Nov 2014 23:26:59 +0000 (23:26 +0000)]
am
d4a6ad3a: am
d981ab06: Check previous user confirmation before auto-confirm put request
* commit '
d4a6ad3a5f5d12ee6901b7a83260267c83dabd76':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 24 Nov 2014 23:22:02 +0000 (23:22 +0000)]
am
d981ab06: Check previous user confirmation before auto-confirm put request
* commit '
d981ab06c6844ef345cd0a1d3077c4840f978989':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 17 Nov 2014 17:50:54 +0000 (09:50 -0800)]
Check previous user confirmation before auto-confirm put request
Also correct a confirm status change check in updateShare.
Bug:
17770561,
18343032
Change-Id: I8e7d10e73604c0bf1c88801a1caef7d579fbd1eb
(cherry picked from commit
e93cc4d347fd5d263d7740ad85f7f99b64651126)
Matthew Xie [Mon, 17 Nov 2014 17:50:54 +0000 (09:50 -0800)]
Check previous user confirmation before auto-confirm put request
Also correct a confirm status change check in updateShare.
Bug:
17770561,
18343032
Change-Id: I8e7d10e73604c0bf1c88801a1caef7d579fbd1eb
(cherry picked from commit
e93cc4d347fd5d263d7740ad85f7f99b64651126)
Matthew Xie [Mon, 17 Nov 2014 17:50:54 +0000 (09:50 -0800)]
Check previous user confirmation before auto-confirm put request
Also correct a confirm status change check in updateShare.
Bug:
17770561,
18343032
Change-Id: I8e7d10e73604c0bf1c88801a1caef7d579fbd1eb
(cherry picked from commit
e93cc4d347fd5d263d7740ad85f7f99b64651126)
Matthew Xie [Mon, 24 Nov 2014 20:36:40 +0000 (20:36 +0000)]
Merge "Check previous user confirmation before auto-confirm put request" into lmp-mr1-dev
Wink Saville [Thu, 20 Nov 2014 21:02:00 +0000 (13:02 -0800)]
Additional changes to SubscriptionManager API as per API council.
bug:
17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
Wink Saville [Thu, 20 Nov 2014 20:29:42 +0000 (20:29 +0000)]
Revert "Additional changes to SubscriptionManager API as per API council."
This reverts commit
13e1a71bf0cf955ac39390fd96fd3f04e1954ef6.
Change-Id: Ib22d745d17dcf6dca3567e903670ca7cc323138b
Wink Saville [Tue, 18 Nov 2014 20:39:08 +0000 (12:39 -0800)]
Additional changes to SubscriptionManager API as per API council.
bug:
17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
Matthew Xie [Mon, 17 Nov 2014 17:50:54 +0000 (09:50 -0800)]
Check previous user confirmation before auto-confirm put request
Also correct a confirm status change check in updateShare.
Bug:
17770561,
18343032
Change-Id: I8e7d10e73604c0bf1c88801a1caef7d579fbd1eb
Wink Saville [Tue, 11 Nov 2014 16:37:56 +0000 (08:37 -0800)]
Update SubscriptionManager API as per API council.
bug:
17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
Mike Lockwood [Sat, 8 Nov 2014 02:15:35 +0000 (02:15 +0000)]
Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev
Matthew Xie [Fri, 7 Nov 2014 17:19:59 +0000 (17:19 +0000)]
am
2f9187a2: am
558571ba: am
5a8e9b03: am
a75e97e7: am
6c32875f: am
b81ccaea: am
964a72ae: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
* commit '
2f9187a2c99f49a07d6c12e2bb4636b68f820ea6':
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
Matthew Xie [Fri, 7 Nov 2014 17:15:56 +0000 (17:15 +0000)]
am
558571ba: am
5a8e9b03: am
a75e97e7: am
6c32875f: am
b81ccaea: am
964a72ae: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
* commit '
558571bac3e21acce0056fed8873b23e0309078a':
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
Matthew Xie [Fri, 7 Nov 2014 17:09:37 +0000 (17:09 +0000)]
am
5a8e9b03: am
a75e97e7: am
6c32875f: am
b81ccaea: am
964a72ae: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
* commit '
5a8e9b03c2a3333a23bc143aa1e036c4556bbe7b':
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
OSDN Git Service
