OSDN Git Service
Ajay Panicker [Wed, 21 Sep 2016 03:12:13 +0000 (03:12 +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 am:
8eb38035db
am:
1bd3e02a8a
Change-Id: I76fad54c596e03425fae75109ef29409cc08f2e0
Ajay Panicker [Wed, 21 Sep 2016 03:10:46 +0000 (03:10 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3dd11d0a34 am:
28dc531ac7 am:
460561cb28 -s ours am:
107bf18aa3 am:
b8b865d786
am:
5b10905e4f
Change-Id: Ia877cdf3963562522cfab0c616666fffaa8d49fa
Ajay Panicker [Wed, 21 Sep 2016 02:57:01 +0000 (02:57 +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
am:
8eb38035db
Change-Id: If56e630962e992a8396c8276f2af88d981fdf1a9
Ajay Panicker [Wed, 21 Sep 2016 02:56:57 +0000 (02:56 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3dd11d0a34 am:
28dc531ac7 am:
460561cb28 -s ours am:
107bf18aa3
am:
b8b865d786
Change-Id: I33ae4ede54f9e324aae18e7bdc5a9925f330ece5
Ajay Panicker [Wed, 21 Sep 2016 02:47:32 +0000 (02: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 am:
0d4475fc01 -s ours am:
5c950df332 am:
1dc5800553
am:
e45190af67
Change-Id: I7558ac8a10b01f11be01a0fe4fc3a5ed1e37b329
Ajay Panicker [Wed, 21 Sep 2016 02:47:27 +0000 (02: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 am:
2f7e244816 -s ours am:
01bb2d1aac am:
5d2069d9dc
am:
21a74c67ca
Change-Id: I7bdc0971bba6d81b537d791288b3517bd91178a6
Ajay Panicker [Wed, 21 Sep 2016 02:40:36 +0000 (02:40 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
554f13336e -s ours am:
8fe2b32637 am:
0c98432a94 am:
5ff155974f -s ours am:
0fb4bfd5b5 am:
93d6266c04
am:
3512fd433a
Change-Id: I4d2bfb289f4cd685a07998df19459c2f5afb254c
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:31:26 +0000 (02:31 +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
am:
1dc5800553
Change-Id: I8bca79ec92f18fba4977c3b2179908752b1c0d93
Ajay Panicker [Wed, 21 Sep 2016 02:31:21 +0000 (02:31 +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
am:
5d2069d9dc
Change-Id: I5f880aa9e6720349ddd1dae938a6653481e5c65d
Ajay Panicker [Wed, 21 Sep 2016 02:24:49 +0000 (02:24 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
554f13336e -s ours am:
8fe2b32637 am:
0c98432a94 am:
5ff155974f -s ours am:
0fb4bfd5b5
am:
93d6266c04
Change-Id: If5eca2ff7bae19928a0ed411c16da795aea1f183
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:44:52 +0000 (00:44 +0000)]
Fix setPairingConfirmation permissions issue (1/2) am:
df3304a333 am:
f8a47ce8ee
am:
3ea7d86110
Change-Id: Iba991daf03a221a4fff7a575dcdffd7181a70861
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:36:09 +0000 (00:36 +0000)]
Fix setPairingConfirmation permissions issue (1/2) am:
df3304a333
am:
f8a47ce8ee
Change-Id: Ia73de9a88d22342fe27f5f1e965cc76b088a7a0d
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:42:46 +0000 (20:42 +0000)]
Import translations. DO NOT MERGE am:
dbd254d610 -s ours am:
d1b0e4d9f9 -s ours
am:
7b0ed70cfa -s ours
Change-Id: I89833c18649ec9ff498212a810a998463dab109f
Bill Yi [Mon, 15 Aug 2016 20:38:46 +0000 (20:38 +0000)]
Import translations. DO NOT MERGE am:
dbd254d610 -s ours
am:
d1b0e4d9f9 -s ours
Change-Id: I9add542263c74693f2176a75ebafb8983c40fbe3
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 20:21:14 +0000 (20:21 +0000)]
Import translations. DO NOT MERGE am:
b8206529c7 -s ours
am:
288ba25e96 -s ours
Change-Id: I843ee9a4f9de59652b5556a9c1f19b66d992b8e5
Bill Yi [Mon, 15 Aug 2016 20:17:17 +0000 (20:17 +0000)]
Import translations. DO NOT MERGE
am:
b8206529c7 -s ours
Change-Id: I69d67b67bb984916cc6793f76c620390ff44de47
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:20:20 +0000 (10:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic8ffd8d1714ac2266d19bac540e4b9a7ac5698bc
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:21:47 +0000 (22:21 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours am:
6d74162bea am:
46790a61d3
am:
5b68598a5f
* commit '
5b68598a5f4e0bef1ee87671617be8476dbf30a6':
Add guest mode functionality (3/3)
Change-Id: Ib4ea170b03af67655426ab030032aeb36342f6ba
Ajay Panicker [Tue, 24 May 2016 22:21:27 +0000 (22:21 +0000)]
Add guest mode functionality (3/3) am:
af5b1764da am:
69689c0098 -s ours
am:
1d6901fdcf
* commit '
1d6901fdcf7e546b3bdbeb1bc1b9c1cae3688745':
Add guest mode functionality (3/3)
Change-Id: If3aaa4e34c015da99d38e984d8b0dd1bedd2e1f3
Ajay Panicker [Tue, 24 May 2016 22:16:17 +0000 (22:16 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours am:
6d74162bea
am:
46790a61d3
* commit '
46790a61d3722128f68bbfd2e12656923def72d0':
Add guest mode functionality (3/3)
Change-Id: I956eb988a5f80ff11af426a406251a852eb1a09a
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:15:53 +0000 (22:15 +0000)]
Add guest mode functionality (3/3) am:
af5b1764da
am:
69689c0098 -s ours
* commit '
69689c0098a7582f8bba393f72b2575ed5508e71':
Add guest mode functionality (3/3)
Change-Id: I0715575a2e7de20356c1b8c0b170eb85eb5e77e3
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
Alain Vongsouvanh [Wed, 18 May 2016 16:15:29 +0000 (16:15 +0000)]
DO NOT MERGE ANYWHERE GATT: Move connection parameters to config.xml
am:
26f325ad37 -s ours
* commit '
26f325ad37145b0de56518f63c97319e322c976b':
DO NOT MERGE ANYWHERE GATT: Move connection parameters to config.xml
Change-Id: Ibe39628179845b7dd1c16604bcb78614eb397474
Alain Vongsouvanh [Fri, 13 May 2016 20:27:59 +0000 (13:27 -0700)]
DO NOT MERGE ANYWHERE GATT: Move connection parameters to config.xml
This makes it easier for OEMs to customize the high prioriy, balanced
and low power mode connection parameters through overlays.
Bug:
18013697
Change-Id: I8b486b772fdb871f2800238cb5e45c4ff0663952
(cherry-picked from
d65009d591017319a429be1a920fdf763e71cebd)
Lianchao Song [Tue, 10 May 2016 17:43:58 +0000 (17:43 +0000)]
DO NOT MERGE ANYWHERE Add missing null pointer check inside HeadSetClientService.stop()
am:
3fe282a78e -s ours
* commit '
3fe282a78e8643329c5d6bc84ad5788cd4366b70':
DO NOT MERGE ANYWHERE Add missing null pointer check inside HeadSetClientService.stop()
Change-Id: I376d9ee987ce3c1d859fbc78095cc85ea78475fa
Lianchao Song [Mon, 9 May 2016 14:50:57 +0000 (22:50 +0800)]
DO NOT MERGE ANYWHERE Add missing null pointer check inside HeadSetClientService.stop()
Bug:
28664857
Change-Id: I62abc4eb4127db2d4f0cde44eca618996f099b49
Signed-off-by: Lianchao Song <songlianchao@huawei.com>
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:45:25 +0000 (20:45 +0000)]
"DO NOT MERGE" Add write SMS protection am:
fd7a794 -s ours am:
daa8d67 am:
5eee2cd am:
48115bb -s ours am:
e2dca1a am:
63bcffd
am:
c522820
* commit '
c5228202951c7bc4e52efa5fc37aded7a3447347':
"DO NOT MERGE" Add write SMS protection
Change-Id: I040910aa52e542acad0fffda4ae4ff5dad101008
Ajay Panicker [Tue, 19 Apr 2016 20:41:25 +0000 (20:41 +0000)]
"DO NOT MERGE" Add write SMS protection am:
fd7a794 -s ours am:
daa8d67 am:
5eee2cd am:
48115bb -s ours am:
e2dca1a
am:
63bcffd
* commit '
63bcffd3da5054da678f927e75c60d71cc45df47':
"DO NOT MERGE" Add write SMS protection
Change-Id: Ia5e0c102295f430fc4ec1d4230b70016d8e4c33e
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
Seven Shen [Tue, 19 Apr 2016 20:33:41 +0000 (20:33 +0000)]
"DO NOT MERGE" Add write SMS protection am:
64745b1 am:
9accc36
am:
6c32c81
* commit '
6c32c815bfbe1058791c6dbee0a98c6b30792963':
"DO NOT MERGE" Add write SMS protection
Change-Id: I4cca8e8ac4b4659ce7dc28264ccd39a53d68098c
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
Seven Shen [Tue, 19 Apr 2016 20:30:39 +0000 (20:30 +0000)]
"DO NOT MERGE" Add write SMS protection am:
64745b1
am:
9accc36
* commit '
9accc36b1a6a9779d31ea6edcc861a69167d37e5':
"DO NOT MERGE" Add write SMS protection
Change-Id: Id5bc27d73ed66c9f12ecf94ec2ef1dc727a6b5c4
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
Bryce Lee [Wed, 2 Mar 2016 03:13:17 +0000 (03:13 +0000)]
DO NOT MERGE ANYWHERE Implement new API for retrieving supported Bluetooth profiles.
am:
90b78410c2 -s ours
* commit '
90b78410c20e3232954891d66bed3352fc5c97e7':
DO NOT MERGE ANYWHERE Implement new API for retrieving supported Bluetooth profiles.
Bryce Lee [Mon, 29 Feb 2016 22:58:49 +0000 (14:58 -0800)]
DO NOT MERGE ANYWHERE Implement new API for retrieving supported Bluetooth profiles.
Bug:
26451648
Change-Id: Ice55556d64208656824d5a6f9b90230d17f0c3bc
Andre Eisenbach [Wed, 24 Feb 2016 18:53:50 +0000 (18:53 +0000)]
Merge "DO NOT MERGE Read Bluetooth interop database entries from settings (2/2)" into mnc-dr-dev am:
e836319052
am:
9e6146ee2f
* commit '
9e6146ee2f94c0301d8cc19ca4655e197528829c':
DO NOT MERGE Read Bluetooth interop database entries from settings (2/2)
Andre Eisenbach [Wed, 24 Feb 2016 18:47:16 +0000 (18:47 +0000)]
Merge "DO NOT MERGE Read Bluetooth interop database entries from settings (2/2)" into mnc-dr-dev
am:
e836319052
* commit '
e8363190528d0d95a35ab265ab91c591eb17a7c3':
DO NOT MERGE Read Bluetooth interop database entries from settings (2/2)
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 [Tue, 23 Feb 2016 21:59:48 +0000 (21:59 +0000)]
DO NOT MERGE Enhance AVRCP Absolute Volume control implementation am:
1a1169dcb2 -s ours
am:
68d4713d8a
* commit '
68d4713d8aa4bf743939b195e2658ae89703ffe7':
DO NOT MERGE Enhance AVRCP Absolute Volume control implementation
Liejun Tao [Tue, 23 Feb 2016 21:53:10 +0000 (21:53 +0000)]
DO NOT MERGE Enhance AVRCP Absolute Volume control implementation
am:
1a1169dcb2 -s ours
* commit '
1a1169dcb2627c9667153232a356984e81f24e82':
DO NOT MERGE Enhance AVRCP Absolute Volume control implementation
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:38:38 +0000 (22:38 +0000)]
Merge "Fix memory leak in Bluetooth AVRCP JNI" into mnc-dr-dev am:
e225df4abf
am:
eeb99e6b70
* commit '
eeb99e6b70dca78c6644c714bd567aa74d5a782d':
Fix memory leak in Bluetooth AVRCP JNI
Ajay Panicker [Sun, 14 Feb 2016 22:38:31 +0000 (22:38 +0000)]
[DO NOT MERGE ANYWHERE] Null terminate MAP instance information am:
082275e311 -s ours
am:
db872b8302 -s ours
* commit '
db872b83023f757554332968ad449c3f815cb5ca':
[DO NOT MERGE ANYWHERE] Null terminate MAP instance information
Akshay Thakker [Sun, 14 Feb 2016 22:28:09 +0000 (22:28 +0000)]
Merge "Fix memory leak in Bluetooth AVRCP JNI" into mnc-dr-dev
am:
e225df4abf
* commit '
e225df4abfe69c5aa99b6463384afd4a67bd39c8':
Fix memory leak in Bluetooth AVRCP JNI
Ajay Panicker [Sun, 14 Feb 2016 22:27:56 +0000 (22:27 +0000)]
[DO NOT MERGE ANYWHERE] Null terminate MAP instance information
am:
082275e311 -s ours
* commit '
082275e31109a282c9ba1a00467d3d11bd65067c':
[DO NOT MERGE ANYWHERE] Null terminate MAP instance information
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
Geoff Mendal [Tue, 2 Feb 2016 15:33:54 +0000 (07:33 -0800)]
Import translations. DO NOT MERGE
Change-Id: I66a6219b85c4b5627c6e716a077eb62d4c36531d
Auto-generated-cl: translation import
Andre Eisenbach [Tue, 12 Jan 2016 19:45:12 +0000 (19:45 +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 am:
44853bf994
am:
be149ebaf5
* commit '
be149ebaf5bd027f75b7b983c6a1f3bd0f712faa':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 19:36:47 +0000 (19:36 +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
am:
44853bf994
* commit '
44853bf9949725ba84c30cb40dc2f99f8b701a70':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
OSDN Git Service
