OSDN Git Service
Ajay Panicker [Tue, 6 Dec 2016 17:41:20 +0000 (17:41 +0000)]
resolve merge conflicts of
f606637 to mnc-dev
am:
846c09a4ff
Change-Id: Idf327a36530c6ead418310e25d9e4944687aa807
Ajay Panicker [Tue, 6 Dec 2016 03:23:49 +0000 (19:23 -0800)]
resolve merge conflicts of
f606637 to mnc-dev
Change-Id: I2e516b0eb36973e097d7837479377a7063b16765
Ajay Panicker [Tue, 6 Dec 2016 02:52:26 +0000 (02:52 +0000)]
Remove MANAGE_DOCUMENTS permission as it isn't needed am:
c37f27194b
am:
2f1531712d
Change-Id: I7544a341b02cb6a6820d0f16d9d7ba0011f263ee
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
Ajay Panicker [Wed, 21 Sep 2016 02:37:40 +0000 (02:37 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am:
0ccca8ac62 am:
56fc3a7642 am:
5bc4962e53 -s ours
am:
8305951cca
Change-Id: I92d2761c392537a1e49a5392e224c1809b311f98
Ajay Panicker [Wed, 21 Sep 2016 02:37:38 +0000 (02:37 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3dd11d0a34 am:
28dc531ac7 am:
460561cb28 -s ours
am:
107bf18aa3
Change-Id: Ice840bd87ac5248e89287bd0699442acdbc68681
Ajay Panicker [Wed, 21 Sep 2016 02:09:12 +0000 (02:09 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am:
0ccca8ac62 am:
56fc3a7642
am:
5bc4962e53 -s ours
Change-Id: Ibd76e7968c99b10e21ecfe313fb584a64ac41951
Ajay Panicker [Wed, 21 Sep 2016 02:09:11 +0000 (02:09 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3dd11d0a34 am:
28dc531ac7
am:
460561cb28 -s ours
Change-Id: I44a2426109e19eb972b1cd57563dfb40d3b91561
Ajay Panicker [Wed, 21 Sep 2016 02:05:37 +0000 (02:05 +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 am:
fcc8d6c900 am:
64998914de am:
0d4475fc01 -s ours
am:
5c950df332
Change-Id: Iabd73bf8da9e82107f8825724bb03bfb7bce233a
Ajay Panicker [Wed, 21 Sep 2016 02:05:33 +0000 (02:05 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours am:
1a3a6accdc -s ours am:
05a136ed33 am:
285c44140c am:
2f7e244816 -s ours
am:
01bb2d1aac
Change-Id: I9a562c2b166eb563436d9f634e1a91ea30a3fcb1
Ajay Panicker [Wed, 21 Sep 2016 02:00:31 +0000 (02:00 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am:
0ccca8ac62
am:
56fc3a7642
Change-Id: Ief8c3e89f7c31045239e6f60d801a30525a68874
Ajay Panicker [Wed, 21 Sep 2016 01:59:21 +0000 (01:59 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
554f13336e -s ours am:
8fe2b32637 am:
0c98432a94 am:
5ff155974f -s ours
am:
0fb4bfd5b5
Change-Id: I237d2df2c93f744f5cd4b5a51330b2bcf4548216
Ajay Panicker [Wed, 21 Sep 2016 01:59:20 +0000 (01:59 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3dd11d0a34
am:
28dc531ac7
Change-Id: I0066914efcd0dd741b4d27d3633d49248180578e
Ajay Panicker [Wed, 21 Sep 2016 01:03:20 +0000 (01:03 +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 am:
fcc8d6c900 am:
64998914de
am:
0d4475fc01 -s ours
Change-Id: Ib1f79cd0b3498aef5a1d797cc5c8b485ac6e2f23
Ajay Panicker [Wed, 21 Sep 2016 01:03:17 +0000 (01:03 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours am:
1a3a6accdc -s ours am:
05a136ed33 am:
285c44140c
am:
2f7e244816 -s ours
Change-Id: I3e1ca8cdfa6a0072fe6db1b913a6f3330da39edf
Ajay Panicker [Wed, 21 Sep 2016 01:02:29 +0000 (01:02 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev
am:
0ccca8ac62
Change-Id: I58afc49fbbd9d1308323b9947edd21f56c87b812
Ajay Panicker [Wed, 21 Sep 2016 01:01:43 +0000 (01:01 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
am:
3dd11d0a34
Change-Id: I983bc5c8ff9cf7249f9da14ac33595b4e6666a65
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:47:56 +0000 (00:47 +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 am:
fcc8d6c900
am:
64998914de
Change-Id: I90fbf86ed01f1b22bc3bc251241250d1df900332
Ajay Panicker [Wed, 21 Sep 2016 00:47:54 +0000 (00:47 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours am:
1a3a6accdc -s ours am:
05a136ed33
am:
285c44140c
Change-Id: I13eaddb2db3073e4a1de8c63480a069cd0b78170
Ajay Panicker [Wed, 21 Sep 2016 00:45:32 +0000 (00:45 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
554f13336e -s ours am:
8fe2b32637 am:
0c98432a94
am:
5ff155974f -s ours
Change-Id: Ib4c5f26da7912161d7cad1b23d9172379bf899ba
Ajay Panicker [Wed, 21 Sep 2016 00:42:07 +0000 (00:42 +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
am:
fcc8d6c900
Change-Id: I0422c6b824af052ba01bec484f400a2ff91d9890
Ajay Panicker [Wed, 21 Sep 2016 00:42:06 +0000 (00:42 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours am:
1a3a6accdc -s ours
am:
05a136ed33
Change-Id: I791af270ae6d542f72c2751159289082ac49df7f
Ajay Panicker [Wed, 21 Sep 2016 00:40:04 +0000 (00:40 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
554f13336e -s ours am:
8fe2b32637
am:
0c98432a94
Change-Id: If2baba2e684084a0ca5b74606675d5f0934a2833
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:21:21 +0000 (00:21 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
554f13336e -s ours
am:
8fe2b32637
Change-Id: I37ccabcb68fbf3f09ec8114493fddceae90a6a23
Ajay Panicker [Wed, 21 Sep 2016 00:19:14 +0000 (00:19 +0000)]
Fix setPairingConfirmation permissions issue (1/2)
am:
df3304a333
Change-Id: Idc90fd17ec010ba786412d76496cd6f89df139b5
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)]
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
Bill Yi [Mon, 15 Aug 2016 20:21:19 +0000 (20:21 +0000)]
Import translations. DO NOT MERGE
am:
dbd254d610 -s ours
Change-Id: If21da5f4a9010847968359db998e85e1336d5d03
Bill Yi [Mon, 15 Aug 2016 17:23:14 +0000 (10:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia34ce6a2225eb57e1144dfe76cc54dd71e3e6af5
Auto-generated-cl: translation import
Bill Yi [Mon, 15 Aug 2016 17:18:53 +0000 (10:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: If36a280cdc94dde060283230bc797125baeebc72
Auto-generated-cl: translation import
Ajay Panicker [Tue, 24 May 2016 22:16:04 +0000 (22:16 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours
am:
6d74162bea
* commit '
6d74162bea2771991a434e0c463b58c080ee1b26':
Add guest mode functionality (3/3)
Change-Id: I90e7d0a5372f25eeb2a92f8773aa81caa3d1de1f
Ajay Panicker [Tue, 24 May 2016 22:13:11 +0000 (22:13 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002
am:
0b2a403b82 -s ours
* commit '
0b2a403b821149b8d0c6ec3ab28db46beff3d75e':
Add guest mode functionality (3/3)
Change-Id: Ic32d37360b9a73b10b27bed3a73d9fdf865db346
Ajay Panicker [Tue, 24 May 2016 22:07:27 +0000 (22:07 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641
am:
b01d679002
* commit '
b01d6790028caf2ba951d5c6eeacf7d4f8ecbbd3':
Add guest mode functionality (3/3)
Change-Id: I98de45cdc87a200c4ff32ccfac88d42edac767a5
Ajay Panicker [Tue, 24 May 2016 22:05:26 +0000 (22:05 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6
am:
480b762641
* commit '
480b76264134b6a44aef6948f32b4bd6a62fcd0f':
Add guest mode functionality (3/3)
Change-Id: I512cef0d0c23d4702cf9de61be4bf8f47c164bac
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 [Tue, 24 May 2016 22:02:02 +0000 (22:02 +0000)]
Add guest mode functionality (3/3)
am:
af5b1764da
* commit '
af5b1764daa3b212d471f000d7091ac07c040453':
Add guest mode functionality (3/3)
Change-Id: I2591d37bb52e2bda796200100f7f21bf00f55d7a
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 [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:38:06 +0000 (20:38 +0000)]
"DO NOT MERGE" Add write SMS protection am:
fd7a794 -s ours am:
daa8d67 am:
5eee2cd am:
48115bb -s ours
am:
e2dca1a
* commit '
e2dca1a7cf3fa6b4d1d8c5769f5d0e052726c699':
"DO NOT MERGE" Add write SMS protection
Change-Id: I79c8f9bc90ba6ad16b854d68c74b075188a6caa0
Ajay Panicker [Tue, 19 Apr 2016 20:33:14 +0000 (20:33 +0000)]
"DO NOT MERGE" Add write SMS protection am:
fd7a794 -s ours am:
daa8d67 am:
5eee2cd
am:
48115bb -s ours
* commit '
48115bb85ee7c7692b9c70afaa8b0d6a32c24a95':
"DO NOT MERGE" Add write SMS protection
Change-Id: I39546ac3a880b12ddeb33c383184967e90209349
Ajay Panicker [Tue, 19 Apr 2016 20:30:02 +0000 (20:30 +0000)]
"DO NOT MERGE" Add write SMS protection am:
fd7a794 -s ours am:
daa8d67
am:
5eee2cd
* commit '
5eee2cd8453f5990d1202d010df01eca724e1010':
"DO NOT MERGE" Add write SMS protection
Change-Id: Id83f27fd2d8b2431cea51c8eb5a4ca152a872647
Ajay Panicker [Tue, 19 Apr 2016 20:26:39 +0000 (20:26 +0000)]
"DO NOT MERGE" Add write SMS protection am:
fd7a794 -s ours
am:
daa8d67
* commit '
daa8d67fe2e26eb9d5282006eb7ec17306b7e277':
"DO NOT MERGE" Add write SMS protection
Change-Id: Ia8f55d6ba4a5d008b107673d8830208c3eefd30a
Seven Shen [Tue, 19 Apr 2016 20:23:31 +0000 (20:23 +0000)]
"DO NOT MERGE" Add write SMS protection
am:
64745b1
* commit '
64745b114948ea0c774f74af5721b6283087247d':
"DO NOT MERGE" Add write SMS protection
Change-Id: Idb905753e4e4d711b11b7d5274e622df4e9c4251
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
Seven Shen [Wed, 6 Apr 2016 19:25:17 +0000 (12:25 -0700)]
"DO NOT MERGE" Add write SMS protection
Bug:
25138326
Change-Id: I9f418370b8725d49e3734406b6f435107bcff021
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 [Wed, 24 Feb 2016 18:35:37 +0000 (18:35 +0000)]
Merge "DO NOT MERGE Read Bluetooth interop database entries from settings (2/2)" into mnc-dr-dev
Liejun Tao [Fri, 18 Dec 2015 20:59:01 +0000 (14:59 -0600)]
DO NOT MERGE Enhance AVRCP Absolute Volume control implementation
1. Remember the current local volume level, current remote volume level.
When user adjusts the volume, compare the returned remote volume
level with desired volume level, if they don't match, do retry.
2.Learn and remember the volume mapping between phone volume level and
remote volume level as the user adjusts volume. When user adjusts to one
remembered volume level, use the mapping directly. Otherwise calculate
the remote volume level and try with method described in step one.
3. Blacklist device if remote device does not tell its initial volume.
4. Define optional threshold for initial volume level to avoid headset
being too loud upon re-connection.
Signed-off-by: Liejun Tao <baibai@motorola.com>
Change-Id: I78112f5f401666f5a680561473a5c7f914071fbe
Andre Eisenbach [Thu, 14 Jan 2016 10:06:23 +0000 (02:06 -0800)]
DO NOT MERGE Read Bluetooth interop database entries from settings (2/2)
Interop database entries are stored in the system settings entry
"BluetoothInteropDatabase". The format is a list of entries separated by
";". An entry consists of a BDA fragment, followed by a comma and an
integer representing a feature from interop.h.
Example:
To disable LE secure connections for devices starting with BDA 11:22:33,
use "11:22:33,0".
Bug:
26548845
Change-Id: I5903930178b70d1eb52d64b1c6051ce8ee346da4
Akshay Thakker [Sun, 14 Feb 2016 22:17:51 +0000 (22:17 +0000)]
Merge "Fix memory leak in Bluetooth AVRCP JNI" into mnc-dr-dev
Casper Bonde [Mon, 4 Jan 2016 15:13:13 +0000 (16:13 +0100)]
Fix memory leak in Bluetooth AVRCP JNI
When rebasing change-id I3941793f9843abf4afa5ffbee40d1d01c118b29b
later change
bbb4110b455b3aa29106d5b4f0a37e1be8e09475 in AOSP,
a memory leak fix was removed by accident. This patch re-enables
the memory leak fix.
Bug:
26383160
Change-Id: I70fd2ea00f6135803f92aad3adda9ce38f47cc32
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
(cherry picked from commit
3a4b8693ee49932247a96099942fa1cecb4670bc)
Ajay Panicker [Fri, 8 Jan 2016 00:05:11 +0000 (16:05 -0800)]
[DO NOT MERGE ANYWHERE] Null terminate MAP instance information
Bug:
26437927
Change-Id: I673de7f7c68b9a02b234bb99c6f89c7fc36f90c9
Andre Eisenbach [Tue, 12 Jan 2016 19:05:23 +0000 (19:05 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36 am:
6e9165b908 -s ours am:
44c3652b4c am:
5a1ae16f4e am:
d59eb61a3e -s ours
am:
d6e1fa7c20
* commit '
d6e1fa7c20fbddbf9ea5fa7b042bfdf276c1463a':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 19:02:36 +0000 (19:02 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36 am:
6e9165b908 -s ours am:
44c3652b4c am:
5a1ae16f4e
am:
d59eb61a3e -s ours
* commit '
d59eb61a3ef94ef69bbbcf8e039895d0fb2fd379':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 19:00:00 +0000 (19:00 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36 am:
6e9165b908 -s ours am:
44c3652b4c
am:
5a1ae16f4e
* commit '
5a1ae16f4ee61b1686e178389485ef65001ed167':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 18:56:46 +0000 (18:56 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36 am:
6e9165b908 -s ours
am:
44c3652b4c
* commit '
44c3652b4cb824089768112a5a5614cb4346cd0f':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
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
Ashwini Munigala [Tue, 12 Jan 2016 18:48:04 +0000 (18:48 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
am:
f81566bb85
* commit '
f81566bb85a1d0388b738dc5553d096591fc9030':
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
Ashwini Munigala [Mon, 7 Sep 2015 16:08:09 +0000 (21:38 +0530)]
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
Ajay Panicker [Thu, 22 Oct 2015 19:00:25 +0000 (12:00 -0700)]
Remove Vcard filter for call-logs
Timestamps were being incorrectly filtered out of Vcards when sending
call-logs.
Bug:
25084927
Change-Id: Ied8912e7d2fdbcc6e6980c3773c4ec5a449842ec
Ajay Panicker [Tue, 13 Oct 2015 22:31:47 +0000 (15:31 -0700)]
Fix file permissions for Bluetooth share
Used a file provider to serve up URIs to allow
applications to access files in the external
Bluetooth directory.
Bug:
23367919
Change-Id: Iadcdcafb235f3eeb50a0e147f3ef982fc9ee38b3
Fyodor Kupolov [Fri, 18 Sep 2015 22:55:21 +0000 (15:55 -0700)]
Fix foreground scans for pre-M apps when location is disabled
Foreground scans were still broken even for L-or-earlier apps when the
location was disabled.
Bug:
24203266
Change-Id: Iaad8d7828a4b383b6cc0a033e94c7d2cd8c9328b
Hemant Gupta [Tue, 29 Sep 2015 18:35:40 +0000 (20:35 +0200)]
SAP: Fix missing connect response when call ongoing at connect
The CALL_ONGOING_STATE was set twice, causing the connect
response not to be sent to the peer device when there was an
ongoing call on DUT. This was violating the SAP Spec.
Bug:
24520367
Change-Id: I290d924870381a82a4abd8b6c42a6d0ebf55652f
Baligh Uddin [Fri, 25 Sep 2015 02:17:21 +0000 (19:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I65c7851b505747cca3d79e899ac168f07520fa0a
Auto-generated-cl: translation import
Baligh Uddin [Fri, 18 Sep 2015 17:04:53 +0000 (10:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1ebce88cb2ffc43352d10ab0a81874f87e4f2d48
Auto-generated-cl: translation import
Ajay Panicker [Thu, 10 Sep 2015 23:31:04 +0000 (16:31 -0700)]
Allow senderAddressing on default filter for message Listing
Adjusted the PARAMETER_MASK_DEFAULT constant for when a
message listing request is recieved and a message filter isnt
provided. This new filter value causes the sender_address field
to be sent along with all the other default information.
Bug:
22163529
Change-Id: I49444cfb341d2e6cc72bdab55aa441d712b03f14
Ajay Panicker [Wed, 9 Sep 2015 19:11:51 +0000 (12:11 -0700)]
Move SMS message to proper folder after sending
Move a SMS message to the correct folder upon receiving an intent
detailing if the message was succesfully sent or not. If sent
successfully, move to the SENT folder, otherwise move it to
the FAILED folder.
Bug:
22992865
Change-Id: Ifdcfb7bb613844f507ef27460ead520c6573b89d
Sungmin Choi [Fri, 4 Sep 2015 22:01:26 +0000 (15:01 -0700)]
Add NREC setting routine even after SCO connected
Bug:
23471393
Change-Id: I46264238e4810a7f280e656220bc68e76eb0cb37
Signed-off-by: koh.changseok <koh.changseok@lge.com>
Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
Casper Bonde [Fri, 28 Aug 2015 10:48:53 +0000 (12:48 +0200)]
SAP: Fix missing attribute in disconnect_ind
The internal TEST flag was removing too much code.
To make it easier to run test, and avoid future issues
with removing needed code, the TEST flag is no longer used
to remove code.
This bug was noticed when running the PTS testcases without the
PTS_TEST flag set. It is assumed that this fix will make
TC_SERVER_DCN_BV_02_I work without the PTS flag, but unless PTS
have updated their test case to accept both a gracefull disconnect
and a forced disconnect, TC_SERVER_DCN_BV_03_I will still fail in
a production build. The SAP spec suggest to use a gracefull disconnect
when initiating a disconnect from a server, hence it is not a good
idea to expose a force disconnect option to the used without first
having tried a gracefull disconnect. Hence the PTS test case
implementation is in conflict with the intented use specified in
the SAP specification.
Without this fix a build with PTS_TEST=false will not work as
intented.
PTS_TEST replaced with system property bt.sap.pts. Set it to true
to enable the force disconnect button.
Bug:
23614694
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
Change-Id: I776a53d6e786c21000ef62094f9a9948ee5880b8
Casper Bonde [Fri, 28 Aug 2015 14:28:03 +0000 (16:28 +0200)]
SAP: Fix logic to skip padding bytes for requests received
As per SAP spec, padding bytes can be 0-3 bytes, but the current code
has incorrect logic, that would lead to calculation of padding bytes
as 4 in case the APDU length was multiple of 4, which would lead to
incorrect parsing logic in SAP Server and can lead to issues of no
response for APDU request from SAP Server as it keeps waiting for
reading more bytes from rfcomm which are not present.
Also check added in code not to send msg to RIL if socket is null to
prevent crash in BT Sap module.
Bug:
23024598
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
Change-Id: I24e4a6b850709c9c32b7e0992626a0219dacef03
Andre Eisenbach [Tue, 1 Sep 2015 01:32:55 +0000 (01:32 +0000)]
am
bf37a029: Fix column ID for PBAP name lookup
* commit '
bf37a0295d110b77b635ca2986172bbdd59331bb':
Fix column ID for PBAP name lookup
Andre Eisenbach [Tue, 1 Sep 2015 00:17:42 +0000 (17:17 -0700)]
Fix column ID for PBAP name lookup
When a phonebook lookup is performed to resolve a phone number into a
name, the wrong column ID is used to retrieve the value from the cursor,
causing an un-caught exception and a failed lookup.
Bug:
22953958
Change-Id: I1f826412916012382903fdf30d43d5cb3516432c
Ajay Panicker [Thu, 27 Aug 2015 19:33:32 +0000 (19:33 +0000)]
am
9135d866: HFP/A2DP: Remove pending auto-connect messages when connected
* commit '
9135d866b12ff019a4eae37e7a8c0df56a4383f2':
HFP/A2DP: Remove pending auto-connect messages when connected
Ajay Panicker [Wed, 26 Aug 2015 20:58:38 +0000 (13:58 -0700)]
HFP/A2DP: Remove pending auto-connect messages when connected
Fixes a bug in which being paired with multiple headsets causes
previously connected headsets to disconnect. This fix removes
pending connect attemps once one device is successfully connected.
Bug:
23111466
Change-Id: Id471189d92643b9626e63197c00e76defd0a72bf
Sharvil Nanavati [Thu, 20 Aug 2015 18:39:47 +0000 (18:39 +0000)]
am
72ecb4ca: Make location enabled check configurable when returning scan results.
* commit '
72ecb4caa630b63f66505ccb202a807b1af4e294':
Make location enabled check configurable when returning scan results.
Sharvil Nanavati [Wed, 19 Aug 2015 18:17:31 +0000 (11:17 -0700)]
Make location enabled check configurable when returning scan results.
Some device classes (e.g. Wear) don't allow location to be enabled but
would still like to allow LE scanning to take place. This patch allows
the location enabled check to be bypassed if the platform is so configured.
Even if the location check is disabled, the calling app must still have
one of the location permissions.
Bug:
21852542
Change-Id: I206366ce262776d4668c0c42e066f0e20f5fdfeb
Vineeta Srivastava [Fri, 14 Aug 2015 06:45:17 +0000 (06:45 +0000)]
Merge "SAP: Do not send padding when packet size is mutiple of 4" into mnc-dr-dev
Fyodor Kupolov [Fri, 14 Aug 2015 00:20:37 +0000 (00:20 +0000)]
am
312e10ad: Block results if location is disabled in Settings
* commit '
312e10ad5bcbb1e3d021c4798d55c40f99c7a6ef':
Block results if location is disabled in Settings
Fyodor Kupolov [Fri, 10 Jul 2015 01:40:51 +0000 (18:40 -0700)]
Block results if location is disabled in Settings
Apps holding PEERS_MAC_ADDRESS permission can still access scan results.
Bug:
21852542
Change-Id: I75fc289e8965df64efb7ff84fe5a4204904724ab
Pavlin Radoslavov [Sat, 8 Aug 2015 02:51:19 +0000 (02:51 +0000)]
am
fdb62835: Revert "Bluetooth-OPP: Enable support to send same file multiple times"
* commit '
fdb62835992e82681d2166dbf5716e26ab57d964':
Revert "Bluetooth-OPP: Enable support to send same file multiple times"
Pavlin Radoslavov [Sat, 8 Aug 2015 01:13:07 +0000 (18:13 -0700)]
Revert "Bluetooth-OPP: Enable support to send same file multiple times"
This reverts commit
86449ac4bc7a8f4b2afeab4da420ae4f980c850a.
The revert is needed to address an issue that crashes Bluetooth.
Bug:
22836458
Change-Id: I8c8b51544637dd1c2250eb91e86cb2ca1bbc9fe7
Miao Chou [Sat, 8 Aug 2015 01:12:29 +0000 (01:12 +0000)]
am
2f70ddb7: am
38b70dd3: (-s ours) am
89cdf16b: am
2816b2cb: 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 '
2f70ddb75a02ac0390822356d718e41017d6e8c6':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 01:02:32 +0000 (01:02 +0000)]
am
38b70dd3: (-s ours) am
89cdf16b: am
2816b2cb: 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 '
38b70dd36255415c1a9fa638122ad4689846f393':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:56:14 +0000 (00:56 +0000)]
am
89cdf16b: am
2816b2cb: 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 '
89cdf16b01a296857ea57801476f642cf0b4f1ec':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:51:39 +0000 (00:51 +0000)]
am
2816b2cb: 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 '
2816b2cba06edb93b353b42087aec7f689035e6e':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:50:11 +0000 (00:50 +0000)]
am
f29687ed: am
2c7ffe6b: (-s ours) am
1267abe1: am
b117219a: am
46f1dd6d: am
19004c75: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
f29687ed0e0ff7c90bd43f89190ca0568f6135ae':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
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
OSDN Git Service
