OSDN Git Service
Sanket Agarwal [Fri, 6 May 2016 02:04:05 +0000 (19:04 -0700)]
Define a label for A2DP Media Browser service
In order for applications to render A2DP SNK audio, they may require a
specific label for the streaming service in-stead of relying on the
application label.
Bug: b/
28537735
Change-Id: If4e422160802ba578b0f38630b82462fcb619b33
(cherry picked from commit
649af3a18c6acdfbaf84a71f215f309e27c43021)
Ajay Panicker [Fri, 6 May 2016 23:58:15 +0000 (23:58 +0000)]
Merge commit \'
98691c26ecdaf8689739966b1aeeaa54f3fd1eb2\' into manual_merge_98691c2 am:
e308ed5889
am:
6cf5d90058
* commit '
6cf5d900582c7ac2379694a80064ecf162097914':
Add protection against LE scanning abuse
Change-Id: I2af6f78d09648a45f6b9ce8020bf14a7fbf35a5e
Ajay Panicker [Fri, 6 May 2016 23:53:16 +0000 (23:53 +0000)]
Merge commit \'
98691c26ecdaf8689739966b1aeeaa54f3fd1eb2\' into manual_merge_98691c2
am:
e308ed5889
* commit '
e308ed5889ddbc6b3fad2f4fd6f2a56ca83c9a2a':
Add protection against LE scanning abuse
Change-Id: Iaf6b9f8668f30318b2256fb1eb239e5bcf92df34
Ajay Panicker [Fri, 6 May 2016 23:10:04 +0000 (16:10 -0700)]
Merge commit '
98691c26ecdaf8689739966b1aeeaa54f3fd1eb2' into manual_merge_98691c2
Change-Id: I57aeffc87caa6da75773d811eb929d9c2aeca13d
Ajay Panicker [Fri, 6 May 2016 22:22:26 +0000 (22:22 +0000)]
Merge "Add protection against LE scanning abuse"
am:
9a7e72caee
* commit '
9a7e72caee9b4cd029667f2077e5f27024fdb0f2':
Add protection against LE scanning abuse
Change-Id: I2dbe24ef46b9ad36f412b9586ecbfdbcc324d829
Treehugger Robot [Fri, 6 May 2016 22:10:49 +0000 (22:10 +0000)]
Merge "Add protection against LE scanning abuse"
Ajay Panicker [Wed, 13 Apr 2016 21:11:57 +0000 (14:11 -0700)]
Add protection against LE scanning abuse
Added two checks to prevent abuse. The first check ensures that an
app doesn't scan too frequently in a certain time period. It is
allowed to scan again after its oldest scan exceedes said time
period. The second check ensures that an app doesn't scan for too
long. Upon starting a scan, this code waits a certain amount of time.
If the app is still scanning by that point, this code stops
the scan and forces the app to use opportunistic scanning instead.
Bug:
27357274
Change-Id: Ic99ac1f838e15ed99fe2fae643ef073d74b5c96b
Marie Janssen [Fri, 6 May 2016 19:03:20 +0000 (19:03 +0000)]
Merge "AVRCP: Provide more media attributes am:
0fcd081ccc am:
1da98c5198" into nyc-mr1-dev-plus-aosp
am:
b60af35039
* commit '
b60af35039bb122a44e87bc9589f3f5e749678d8':
Change-Id: I0c965a3c45a7bf42bda78e7072ed1d2c08451ea9
Marie Janssen [Fri, 6 May 2016 19:03:19 +0000 (19:03 +0000)]
AVRCP: Provide more media attributes am:
0fcd081ccc am:
3baac1fb6a
am:
4152321ee9
* commit '
4152321ee9b0493c13dd2e43548fc351dc63f297':
AVRCP: Provide more media attributes
Change-Id: Iba99728b853e097062d6510f83eee4d7c25821f5
Android Build Merger (Role) [Fri, 6 May 2016 18:58:51 +0000 (18:58 +0000)]
Merge "AVRCP: Provide more media attributes am:
0fcd081ccc am:
1da98c5198" into nyc-mr1-dev-plus-aosp
Marie Janssen [Fri, 6 May 2016 18:58:40 +0000 (18:58 +0000)]
AVRCP: Provide more media attributes am:
0fcd081ccc
am:
1da98c5198
* commit '
1da98c5198379176f7d5a4cb66ce6d4117d421e7':
AVRCP: Provide more media attributes
Change-Id: I407dcbbf86f0472179460c7d02fe81e93d33906d
Marie Janssen [Fri, 6 May 2016 18:58:39 +0000 (18:58 +0000)]
AVRCP: Provide more media attributes am:
0fcd081ccc
am:
3baac1fb6a
* commit '
3baac1fb6afa84c3fdaa5ba96df9df25fa86cd24':
AVRCP: Provide more media attributes
Change-Id: Iffdbbd00538986895c84052ab0c999aa4268385a
Marie Janssen [Fri, 6 May 2016 18:53:53 +0000 (18:53 +0000)]
AVRCP: Provide more media attributes
am:
0fcd081ccc
* commit '
0fcd081cccbf624a3a886fe4eb68adc3498e695c':
AVRCP: Provide more media attributes
Change-Id: I7ccda700abaf47a0accf12a1220f0e1a3f2b2b4c
Marie Janssen [Fri, 6 May 2016 18:53:49 +0000 (18:53 +0000)]
AVRCP: Provide more media attributes
am:
0fcd081ccc
* commit '
0fcd081cccbf624a3a886fe4eb68adc3498e695c':
AVRCP: Provide more media attributes
Change-Id: I0bb3438288534aee9bdfb30a359872560e302804
Hua Song [Thu, 5 May 2016 21:19:15 +0000 (21:19 +0000)]
Merge "OPP: Use addFlags() instead of setFlags() when adding flags to the ACTION_VIEW intent" am:
5df2915a97 am:
01bdd183c2 am:
ae215fe26a
am:
c4434395b1
* commit '
c4434395b1d9497b64a53cc81cd05be6bef537ab':
OPP: Use addFlags() instead of setFlags() when adding flags to the ACTION_VIEW intent
Change-Id: I34e0b16b0df27b994239c78046b326480c132a53
Hua Song [Thu, 5 May 2016 21:14:35 +0000 (21:14 +0000)]
Merge "OPP: Use addFlags() instead of setFlags() when adding flags to the ACTION_VIEW intent" am:
5df2915a97 am:
01bdd183c2
am:
ae215fe26a
* commit '
ae215fe26af65257d3fd0adb345402c4b91d1b34':
OPP: Use addFlags() instead of setFlags() when adding flags to the ACTION_VIEW intent
Change-Id: I6c11788982e850a0cd3f55bd430775f2fe047a31
Hua Song [Thu, 5 May 2016 21:09:26 +0000 (21:09 +0000)]
Merge "OPP: Use addFlags() instead of setFlags() when adding flags to the ACTION_VIEW intent" am:
5df2915a97
am:
01bdd183c2
* commit '
01bdd183c2b0bda4814399e94fc967cb1cfe8794':
OPP: Use addFlags() instead of setFlags() when adding flags to the ACTION_VIEW intent
Change-Id: Ib4a753745884510afa83705c9adc281dd6846b51
Hua Song [Thu, 5 May 2016 21:04:46 +0000 (21:04 +0000)]
Merge "OPP: Use addFlags() instead of setFlags() when adding flags to the ACTION_VIEW intent"
am:
5df2915a97
* commit '
5df2915a97c5df3e0f7c91c15829849ebc7b6746':
OPP: Use addFlags() instead of setFlags() when adding flags to the ACTION_VIEW intent
Change-Id: I2e4fc0a6a67662ea2f4c5978423ceceb9700b0cc
Treehugger Robot [Thu, 5 May 2016 21:00:05 +0000 (21:00 +0000)]
Merge "OPP: Use addFlags() instead of setFlags() when adding flags to the ACTION_VIEW intent"
Ian Rogers [Thu, 5 May 2016 20:46:01 +0000 (20:46 +0000)]
Merge "Fix divergent equals and hashCode behavior am:
27b250928c am:
c0396c8336" into nyc-mr1-dev-plus-aosp
am:
af2758310e
* commit '
af2758310e8b7c5d33741696377ffa1cb48ccb06':
Change-Id: I9114aec5950a15ce902c0e466b16b173794f44a3
Ian Rogers [Thu, 5 May 2016 20:46:00 +0000 (20:46 +0000)]
Fix divergent equals and hashCode behavior am:
27b250928c am:
e0048fc1d5
am:
17f4e8f251
* commit '
17f4e8f251bd220e42433238ce85ce6ba1481c44':
Fix divergent equals and hashCode behavior
Change-Id: I4002d48e32ed99e86e0edd1a388dc5880de3631b
Android Build Merger (Role) [Thu, 5 May 2016 20:41:06 +0000 (20:41 +0000)]
Merge "Fix divergent equals and hashCode behavior am:
27b250928c am:
c0396c8336" into nyc-mr1-dev-plus-aosp
Ian Rogers [Thu, 5 May 2016 20:40:58 +0000 (20:40 +0000)]
Fix divergent equals and hashCode behavior am:
27b250928c
am:
c0396c8336
* commit '
c0396c83369406ee51abf8109d1fa6ab38e3289c':
Fix divergent equals and hashCode behavior
Change-Id: Ic5321e7c141f162d9da8ca6b98aff55a99c5daae
Ian Rogers [Thu, 5 May 2016 20:40:55 +0000 (20:40 +0000)]
Fix divergent equals and hashCode behavior am:
27b250928c
am:
e0048fc1d5
* commit '
e0048fc1d5767a1c6648064f7fd262b7f83356dc':
Fix divergent equals and hashCode behavior
Change-Id: I23875d3afcdf019c2b28b1bf88978507624fa8a2
Ian Rogers [Thu, 5 May 2016 20:36:19 +0000 (20:36 +0000)]
Fix divergent equals and hashCode behavior
am:
27b250928c
* commit '
27b250928cb3401d9a0a3a3f4b2026f1a431b6df':
Fix divergent equals and hashCode behavior
Change-Id: I5a31d6166a0e1ed2d4f4c6cedb0afb5c831836f7
Ian Rogers [Thu, 5 May 2016 20:36:15 +0000 (20:36 +0000)]
Fix divergent equals and hashCode behavior
am:
27b250928c
* commit '
27b250928cb3401d9a0a3a3f4b2026f1a431b6df':
Fix divergent equals and hashCode behavior
Change-Id: Ica78e8006766bec9011cef447db87ec114b71b42
Marie Janssen [Mon, 25 Apr 2016 18:24:39 +0000 (11:24 -0700)]
AVRCP: Provide more media attributes
Add track number, total tracks, genre, and consolidate MediaAttribute
handling into a single place.
Bug:
28589463
Change-Id: I53049bc2a43c0f30af9639fbc3d6a02cd8a74900
Ian Rogers [Wed, 4 May 2016 17:37:28 +0000 (10:37 -0700)]
Fix divergent equals and hashCode behavior
Calling Objects.hash with a byte[] will call the identity hashCode on the
byte[] (data, data_mask) and this doesn't agree with the use of
Objects.deepEquals in equals.
Bug caught by error prone.
Bug:
27723540
Change-Id: Ic33f9a341165db6c9339321f81f7af63d627a2cb
Hua Song [Thu, 5 May 2016 07:20:28 +0000 (15:20 +0800)]
OPP: Use addFlags() instead of setFlags() when adding flags to the ACTION_VIEW intent
Signed-off-by: Hua Song <shcalm@gmail.com>
Change-Id: Ie370b1fc599dbb1d8effca409de28e11f0e2b370
Ian Rogers [Thu, 5 May 2016 04:47:50 +0000 (04:47 +0000)]
Merge "Fix divergent equals and hashCode behavior" am:
c19deeb758 am:
953bc530a3 am:
25c9b7e2a4
am:
a05d4b378b
* commit '
a05d4b378b4b384559713c4ef9565cab2901cbe1':
Fix divergent equals and hashCode behavior
Change-Id: Id562e7233725873c37e92d7807e05901ebc948e8
Ian Rogers [Thu, 5 May 2016 04:45:36 +0000 (04:45 +0000)]
Merge "Fix divergent equals and hashCode behavior" am:
c19deeb758 am:
953bc530a3
am:
25c9b7e2a4
* commit '
25c9b7e2a486df02b462d2b89b674c5098c89e60':
Fix divergent equals and hashCode behavior
Change-Id: I91ab73c2bdad8e65b442782692ebcdc6919324e0
Ian Rogers [Thu, 5 May 2016 04:43:15 +0000 (04:43 +0000)]
Merge "Fix divergent equals and hashCode behavior" am:
c19deeb758
am:
953bc530a3
* commit '
953bc530a3d16c5e73e95b0abacc56deb241996b':
Fix divergent equals and hashCode behavior
Change-Id: I8e40f7cd8db56d007e1a7f61f1a0f52e56116922
Ian Rogers [Thu, 5 May 2016 04:40:58 +0000 (04:40 +0000)]
Merge "Fix divergent equals and hashCode behavior"
am:
c19deeb758
* commit '
c19deeb758de2107beeeb29b2f221d518dfca141':
Fix divergent equals and hashCode behavior
Change-Id: Ia876f453ae436e4079a33b37c0441d35bdf5a99b
Treehugger Robot [Thu, 5 May 2016 04:37:09 +0000 (04:37 +0000)]
Merge "Fix divergent equals and hashCode behavior"
Ian Rogers [Wed, 4 May 2016 17:37:28 +0000 (10:37 -0700)]
Fix divergent equals and hashCode behavior
Calling Objects.hash with a byte[] will call the identity hashCode on the
byte[] (data, data_mask) and this doesn't agree with the use of
Objects.deepEquals in equals.
Bug caught by error prone.
Bug:
27723540
Change-Id: Ic33f9a341165db6c9339321f81f7af63d627a2cb
Marie Janssen [Wed, 4 May 2016 23:54:00 +0000 (23:54 +0000)]
Merge "AVRCP: Provide more media attributes" am:
124563d21a am:
f9e644effb am:
1e56607e23
am:
5d5a280697
* commit '
5d5a2806979a7216b25f40af820681f8f6fd5b34':
AVRCP: Provide more media attributes
Change-Id: I50f080b5d328d52701676b709163b52f50e7ca7f
Marie Janssen [Wed, 4 May 2016 23:48:24 +0000 (23:48 +0000)]
Merge "AVRCP: Provide more media attributes" am:
124563d21a am:
f9e644effb
am:
1e56607e23
* commit '
1e56607e2310341b96512bacb4e7258d44cbc9fa':
AVRCP: Provide more media attributes
Change-Id: I116e69d06905bac1fb3aaf00bd8ef2780bf3bc9d
Marie Janssen [Wed, 4 May 2016 23:46:01 +0000 (23:46 +0000)]
Merge "AVRCP: Provide more media attributes" am:
124563d21a
am:
f9e644effb
* commit '
f9e644effb04eda411d453e5691fe699c8a215ca':
AVRCP: Provide more media attributes
Change-Id: I1b69d71566eb6667639d0a10adda6a45a75ab6a2
Marie Janssen [Wed, 4 May 2016 23:43:34 +0000 (23:43 +0000)]
Merge "AVRCP: Provide more media attributes"
am:
124563d21a
* commit '
124563d21a8454ce627c991ac6fff56407654939':
AVRCP: Provide more media attributes
Change-Id: I8d8467af360f7d2b72c98287a70863ab7a39abd5
Treehugger Robot [Wed, 4 May 2016 23:35:50 +0000 (23:35 +0000)]
Merge "AVRCP: Provide more media attributes"
Jakub Pawlowski [Wed, 4 May 2016 22:42:45 +0000 (22:42 +0000)]
Fix work profile app not being able to create bond am:
11976279d5 am:
1bf9957d96
am:
f825147188
* commit '
f825147188e4cf99fcbc31bfd0f9a92728b29198':
Change-Id: Ie32b9730874d51bb96160ab998e7dc2ca0a53c21
Jakub Pawlowski [Wed, 4 May 2016 22:42:44 +0000 (22:42 +0000)]
Fix work profile app not being able to create bond am:
11976279d5 am:
29e88d6e4d
am:
740b674bbc
* commit '
740b674bbc11e02df9eb228fa3b87e50f965ef58':
Fix work profile app not being able to create bond
Change-Id: I1fb97eff026c7009511fc8f6c7b3a623f4e14174
Marie Janssen [Mon, 25 Apr 2016 18:24:39 +0000 (11:24 -0700)]
AVRCP: Provide more media attributes
Add track number, total tracks, genre, and consolidate MediaAttribute
handling into a single place.
Bug:
28589463
Change-Id: I53049bc2a43c0f30af9639fbc3d6a02cd8a74900
Jakub Pawlowski [Wed, 4 May 2016 22:08:06 +0000 (22:08 +0000)]
Fix work profile app not being able to create bond am:
11976279d5
am:
1bf9957d96
* commit '
1bf9957d968d9829d35d0fd6adf7372eb8f576a8':
Change-Id: I937f7142b5c4af38d29dc8cc276ea2d7d60ab427
Jakub Pawlowski [Wed, 4 May 2016 22:05:52 +0000 (22:05 +0000)]
Fix work profile app not being able to create bond am:
11976279d5
am:
29e88d6e4d
* commit '
29e88d6e4d3bd5cc8799f0e769efa826fbda93af':
Fix work profile app not being able to create bond
Change-Id: Icd7d9b8c60e749a788109a7fbd5e665583fc3473
Jakub Pawlowski [Wed, 4 May 2016 22:03:06 +0000 (22:03 +0000)]
Fix work profile app not being able to create bond
am:
11976279d5
* commit '
11976279d5403fb65d9f0ea72b0e450dfd841958':
Fix work profile app not being able to create bond
Change-Id: I1a94f94aa7f12c1c46cb52f69e37418c792f6b99
Jakub Pawlowski [Wed, 4 May 2016 22:02:56 +0000 (22:02 +0000)]
Fix work profile app not being able to create bond
am:
11976279d5
* commit '
11976279d5403fb65d9f0ea72b0e450dfd841958':
Fix work profile app not being able to create bond
Change-Id: I99c8f2b889e0f0893e6b54bc312aef6a6eb19cd1
Jakub Pawlowski [Fri, 15 Apr 2016 12:30:01 +0000 (05:30 -0700)]
Fix work profile app not being able to create bond
Bug:
28153078
Change-Id: I49c020d7d016c667a6cb3366ef862a1eb9dfb4d5
Ajay Panicker [Tue, 3 May 2016 01:00:27 +0000 (01:00 +0000)]
Merge "Make Bluetooth encryption aware am:
cf48e13e3b am:
37850ce258" into nyc-mr1-dev-plus-aosp
am:
003cd99590
* commit '
003cd995901b2047c12c4a6364c7db08c0c02479':
Change-Id: I70b0d90cfe607f461b91cf0bdb2fff3235efaf02
Ajay Panicker [Tue, 3 May 2016 01:00:26 +0000 (01:00 +0000)]
Make Bluetooth encryption aware am:
cf48e13e3b am:
e01b52091b
am:
a636a03d7b
* commit '
a636a03d7b5b51ec4f15607c23760b0bbd7ef1a9':
Make Bluetooth encryption aware
Change-Id: Ia6371766b2c55757671ad315765ab3405687843f
Android Build Merger (Role) [Tue, 3 May 2016 00:53:17 +0000 (00:53 +0000)]
Merge "Make Bluetooth encryption aware am:
cf48e13e3b am:
37850ce258" into nyc-mr1-dev-plus-aosp
Ajay Panicker [Tue, 3 May 2016 00:53:02 +0000 (00:53 +0000)]
Make Bluetooth encryption aware am:
cf48e13e3b
am:
e01b52091b
* commit '
e01b52091b6197202ebba345cf7d230fd298c382':
Make Bluetooth encryption aware
Change-Id: I43f86ff920789938ac143b21a5579b4097c18bcf
Ajay Panicker [Tue, 3 May 2016 00:53:02 +0000 (00:53 +0000)]
Make Bluetooth encryption aware am:
cf48e13e3b
am:
37850ce258
* commit '
37850ce25811d6096bd87a42cfa818b0279434ab':
Make Bluetooth encryption aware
Change-Id: I1e73464b004b5aadf7215b19492178a8825930ed
Ajay Panicker [Tue, 3 May 2016 00:50:45 +0000 (00:50 +0000)]
Make Bluetooth encryption aware
am:
cf48e13e3b
* commit '
cf48e13e3bcfbc326bf860331d367a6e4524af8d':
Make Bluetooth encryption aware
Change-Id: I9e9f85059213a41cea86bfb98795fff96d35fadf
Ajay Panicker [Tue, 3 May 2016 00:48:28 +0000 (00:48 +0000)]
Make Bluetooth encryption aware
am:
cf48e13e3b
* commit '
cf48e13e3bcfbc326bf860331d367a6e4524af8d':
Make Bluetooth encryption aware
Change-Id: Ie1a336ece5586f1cd7901cf86c1317a59b5c8683
Ajay Panicker [Mon, 11 Apr 2016 23:45:52 +0000 (16:45 -0700)]
Make Bluetooth encryption aware
Allow the Bluetooth application to be bound to before the user
enters their lock pattern. Also move the file used for sharing
text blobs to private storage as that could contain private data.
Bug:
27332939
Change-Id: Iefa15939967afeb34c088957834ad5c35d7fd8fe
Treehugger Robot [Wed, 27 Apr 2016 03:04:47 +0000 (03:04 +0000)]
Merge "Log permission check failure as warning" am:
dd40b31 am:
7ede44c am:
9d33ceb
am:
f19461d
* commit '
f19461ddb9e62634cdc0b215b6e291d09d34f4be':
Log permission check failure as warning
Change-Id: If7e0c2dca355a8138283a91740054035d721be14
Jakub Pawlowski [Tue, 26 Apr 2016 21:15:38 +0000 (21:15 +0000)]
Merge "Log permission check failure as warning" am:
dd40b31 am:
7ede44c
am:
9d33ceb
* commit '
9d33cebfe1a164a97855a4bc750da648f7d6d3a2':
Log permission check failure as warning
Change-Id: I0171e1567899738ab8f8491631d3f359553b33bf
Treehugger Robot [Tue, 26 Apr 2016 21:12:12 +0000 (21:12 +0000)]
Merge "Log permission check failure as warning" am:
dd40b31
am:
7ede44c
* commit '
7ede44cbbee8b4f21ee802c49406be0b097d8f2a':
Log permission check failure as warning
Change-Id: I540684bcd1ac150047f22b26a89ff609980c2aac
Jakub Pawlowski [Tue, 26 Apr 2016 19:19:41 +0000 (19:19 +0000)]
Merge "Log permission check failure as warning"
am:
dd40b31
* commit '
dd40b31189c0edbab98da3531436d54f30cec90b':
Log permission check failure as warning
Change-Id: Ib9280678efc47f75aaf4d5e949f4961b0fcf3c78
Treehugger Robot [Tue, 26 Apr 2016 19:11:21 +0000 (19:11 +0000)]
Merge "Log permission check failure as warning"
Jakub Pawlowski [Tue, 26 Apr 2016 18:32:00 +0000 (18:32 +0000)]
Merge "Log permission check failure as warning" into nyc-dev am:
7a94490 am:
dba1718
am:
446ffc7
* commit '
446ffc734c566e49758b46218c624a0c94c1fc0d':
Change-Id: I4c41b93c6b34a67f4efb8e35a6c56823e1ca6fb1
Liejun Tao [Tue, 26 Apr 2016 18:32:00 +0000 (18:32 +0000)]
Absolute volume: Black list device if remote can\'t change volume am:
2583f09 am:
4b928b2
am:
227408c
* commit '
227408c7770db449d2b061703220dbfee7165256':
Change-Id: I9137af4c5e633a49cc93fee96e30c47b382248a1
Jakub Pawlowski [Tue, 26 Apr 2016 18:32:00 +0000 (18:32 +0000)]
Merge "Log permission check failure as warning" into nyc-dev am:
7a94490 am:
b6f5bd6
am:
25a36f3
* commit '
25a36f32887131383e30046384583a17d283e2c0':
Log permission check failure as warning
Change-Id: I14394ddda6f1b89ed44293fbd8be8d7dd1ba6d17
Liejun Tao [Tue, 26 Apr 2016 18:32:00 +0000 (18:32 +0000)]
Absolute volume: Black list device if remote can\'t change volume am:
2583f09 am:
6ce245b
am:
5a6f31e
* commit '
5a6f31eb63d41ae8ee04065e98eb2f192748a647':
Absolute volume: Black list device if remote can't change volume
Change-Id: I1b751a12210f349f1966023aa2ac1306541ae8ce
Jakub Pawlowski [Tue, 26 Apr 2016 18:31:46 +0000 (18:31 +0000)]
Merge "Log permission check failure as warning" into nyc-dev am:
7a94490
am:
dba1718
* commit '
dba17180bf4e9c25ec87f62dc20ea54a281b5e22':
Change-Id: I8cfd4b31a2be0040e4922769697bf545b8319a5b
Liejun Tao [Tue, 26 Apr 2016 18:31:46 +0000 (18:31 +0000)]
Absolute volume: Black list device if remote can\'t change volume am:
2583f09
am:
4b928b2
* commit '
4b928b2d9c9b846ea7638600a6b8677a9a57c908':
Change-Id: I29a377ffa7dbd427d55126005a4362c88a8540b2
Jakub Pawlowski [Tue, 26 Apr 2016 18:28:48 +0000 (18:28 +0000)]
Merge "Log permission check failure as warning" into nyc-dev am:
7a94490
am:
b6f5bd6
* commit '
b6f5bd6970ca3e98b71d8c985aff76d700852da1':
Log permission check failure as warning
Change-Id: Ic419020f67c37609ca0d63280ece4bef62aa3b5e
Liejun Tao [Tue, 26 Apr 2016 18:28:48 +0000 (18:28 +0000)]
Absolute volume: Black list device if remote can\'t change volume am:
2583f09
am:
6ce245b
* commit '
6ce245b9aa1556df12e51ece8bdbf408df3e7a0b':
Absolute volume: Black list device if remote can't change volume
Change-Id: I9c17a8a93bde8ebaaa5fa140beb148bf660ae144
Jakub Pawlowski [Tue, 26 Apr 2016 18:28:09 +0000 (18:28 +0000)]
Merge "Log permission check failure as warning" into nyc-dev
am:
7a94490
* commit '
7a9449022d3ea672b96062df7a16d9259b2a66f0':
Log permission check failure as warning
Change-Id: Iaa81b40dbfc2f4fa7ab265e157d21664cee796ec
Liejun Tao [Tue, 26 Apr 2016 18:28:09 +0000 (18:28 +0000)]
Absolute volume: Black list device if remote can\'t change volume
am:
2583f09
* commit '
2583f09407c8265c12d198d408692c75eabf22a3':
Absolute volume: Black list device if remote can't change volume
Change-Id: Ib163083717c7caeb90bd87389c0a90495a8b4bdf
Jakub Pawlowski [Tue, 26 Apr 2016 18:23:52 +0000 (18:23 +0000)]
Merge "Log permission check failure as warning" into nyc-dev
am:
7a94490
* commit '
7a9449022d3ea672b96062df7a16d9259b2a66f0':
Log permission check failure as warning
Change-Id: I6d700e26a443a3c6496cc9148eba840544558d52
Jakub Pawlowski [Tue, 26 Apr 2016 18:20:41 +0000 (18:20 +0000)]
Merge "Log permission check failure as warning" into nyc-dev
Liejun Tao [Tue, 26 Apr 2016 18:17:26 +0000 (18:17 +0000)]
Absolute volume: Black list device if remote can\'t change volume
am:
2583f09
* commit '
2583f09407c8265c12d198d408692c75eabf22a3':
Absolute volume: Black list device if remote can't change volume
Change-Id: I1dd27493c5708f4d79e4134cfb00fe17d90b85f3
Treehugger Robot [Tue, 26 Apr 2016 17:43:18 +0000 (17:43 +0000)]
Merge "Absolute volume: Black list device if remote can\'t change volume" am:
0af237b am:
82e7f6b am:
a664da8
am:
d04363e
* commit '
d04363e38cd3528330825392e311a007b3efcb60':
Absolute volume: Black list device if remote can't change volume
Change-Id: I6ff9fcdbc9c62de3ed845d93ff16901a09b86bfd
Liejun Tao [Tue, 26 Apr 2016 17:33:06 +0000 (17:33 +0000)]
Merge "Absolute volume: Black list device if remote can\'t change volume" am:
0af237b am:
82e7f6b
am:
a664da8
* commit '
a664da8ab16e09bae6c25d015d13222bc6065c39':
Absolute volume: Black list device if remote can't change volume
Change-Id: I7bdf65a1aa3cad244c29f958fcb25eead1f5b6ed
Treehugger Robot [Tue, 26 Apr 2016 17:26:05 +0000 (17:26 +0000)]
Merge "Absolute volume: Black list device if remote can\'t change volume" am:
0af237b
am:
82e7f6b
* commit '
82e7f6b9d8acd290134a1b7b9eaea7077526dd35':
Absolute volume: Black list device if remote can't change volume
Change-Id: I4ae92f84e1915c7b13acd16bfd4015fe1f86b992
Liejun Tao [Tue, 26 Apr 2016 17:22:46 +0000 (17:22 +0000)]
Merge "Absolute volume: Black list device if remote can\'t change volume"
am:
0af237b
* commit '
0af237b682f07456c427108675115ed6cea1867e':
Absolute volume: Black list device if remote can't change volume
Change-Id: I682269b2de70af42c86458c2bb6a9639ce207189
Treehugger Robot [Tue, 26 Apr 2016 17:13:50 +0000 (17:13 +0000)]
Merge "Absolute volume: Black list device if remote can't change volume"
Liejun Tao [Wed, 9 Mar 2016 05:04:17 +0000 (23:04 -0600)]
Absolute volume: Black list device if remote can't change volume
If remote device failed to change volume too many times, black list it
to avoid using Absolute volume feature.
Bug:
26694114
Change-Id: Idb7a772b0ef936b2351bfc92722ec3c0d748822c
Liejun Tao [Wed, 9 Mar 2016 05:04:17 +0000 (23:04 -0600)]
Absolute volume: Black list device if remote can't change volume
If remote device failed to change volume too many times, black list it
to avoid using Absolute volume feature.
Bug:
26694114
Change-Id: Idb7a772b0ef936b2351bfc92722ec3c0d748822c
Jakub Pawlowski [Tue, 26 Apr 2016 16:13:09 +0000 (09:13 -0700)]
Log permission check failure as warning
Currently when permission check fails, there is no way for users to see
what went wrong. This patch fixes that by providing better log message.
Bug:
28328321
Change-Id: I11f336c6c0560c4be482fefefaf95b70a06a63d6
Jakub Pawlowski [Tue, 26 Apr 2016 16:13:09 +0000 (09:13 -0700)]
Log permission check failure as warning
Currently when permission check fails, there is no way for users to see
what went wrong. This patch fixes that by providing better log message.
Bug:
28328321
Change-Id: I11f336c6c0560c4be482fefefaf95b70a06a63d6
TreeHugger Robot [Sat, 23 Apr 2016 01:24:09 +0000 (01:24 +0000)]
Merge "A2DP MediaSession active state management and NPE"
Ajay Panicker [Sat, 23 Apr 2016 00:17:41 +0000 (00:17 +0000)]
Merge "Properly label app as unregistered and add NPE protection" into nyc-dev am:
e062a53 am:
542d334
am:
bba7543
* commit '
bba7543785511b244ba74d32a3233abdb795a1c1':
Change-Id: I4aee551a8534e628beb2c586571960567584f1eb
Ajay Panicker [Sat, 23 Apr 2016 00:17:41 +0000 (00:17 +0000)]
Merge "Properly label app as unregistered and add NPE protection" into nyc-dev am:
e062a53 am:
d491dd7
am:
eff657e
* commit '
eff657e3d4e4b357e7118a4cf90dcfd204d5e976':
Properly label app as unregistered and add NPE protection
Change-Id: I871c144feefdb9e598f205d12d2a98966b7cc85a
Ajay Panicker [Sat, 23 Apr 2016 00:02:04 +0000 (00:02 +0000)]
Merge "Properly label app as unregistered and add NPE protection" into nyc-dev am:
e062a53
am:
542d334
* commit '
542d334a4902c65078acda1190fa9da4a2435d4a':
Change-Id: I3b9d8c022d8cf6d75172f17926b44b2d45c46c9b
Ajay Panicker [Sat, 23 Apr 2016 00:01:37 +0000 (00:01 +0000)]
Merge "Properly label app as unregistered and add NPE protection" into nyc-dev am:
e062a53
am:
d491dd7
* commit '
d491dd7b0360331fa78e73273e68389af116da00':
Properly label app as unregistered and add NPE protection
Change-Id: Id4e77b82944f4336ca27f456de9e2d255e49ab5f
Sanket Agarwal [Fri, 22 Apr 2016 20:06:24 +0000 (13:06 -0700)]
A2DP MediaSession active state management and NPE
UIs (such as SystemUI) depend on MediaSession.isActive state to
determine whether to show it on the overview (or shades). Currently we
are keeping the session active ever since the first bluetooth connect (A2DP) happens.
This change makes the session to be active when the device connects and
the first play happens (i.e. the play state of remote device
irrespective of who initated it) and in-active when device disconnects.
Also, avoid a NPE that may happen due to races between delay in
broadcasts and accesing bluetooth state machine.
Bug: b/
28345602
Bug: b/
28330860
Change-Id: Id7686308ada0b608b959258d137772ee5f24c18f
(cherry picked from commit
faa30bec93650414fb90b60b5a488b32dd54b9ac)
Ajay Panicker [Fri, 22 Apr 2016 23:47:42 +0000 (23:47 +0000)]
Merge "Properly label app as unregistered and add NPE protection" into nyc-dev
am:
e062a53
* commit '
e062a53f929cfbb90a81c966f1e1b207510247f3':
Properly label app as unregistered and add NPE protection
Change-Id: I0cd7d94ad119e95bb2a65e4d10cd2fe48abd9ad8
Ajay Panicker [Fri, 22 Apr 2016 23:47:15 +0000 (23:47 +0000)]
Merge "Properly label app as unregistered and add NPE protection" into nyc-dev
am:
e062a53
* commit '
e062a53f929cfbb90a81c966f1e1b207510247f3':
Properly label app as unregistered and add NPE protection
Change-Id: I257b811c9fcfc3f4e4516701091f9d810682b64e
Ajay Panicker [Fri, 22 Apr 2016 22:46:33 +0000 (22:46 +0000)]
Merge "Properly label app as unregistered and add NPE protection" into nyc-dev
Calvin On [Fri, 22 Apr 2016 22:15:36 +0000 (22:15 +0000)]
Merge "Synchronize access to ServiceDeclaration fields. am:
f8ecbbb am:
a37273e" into nyc-mr1-dev-plus-aosp
am:
50f1562
* commit '
50f1562e1f348d576ed8230dab82616f857ae2aa':
Change-Id: I71d7b8ec09dce9d59552fbabf0ccd4081eaa768b
Calvin On [Fri, 22 Apr 2016 22:15:35 +0000 (22:15 +0000)]
Synchronize access to ServiceDeclaration fields. am:
f8ecbbb am:
5576218
am:
87d0bef
* commit '
87d0bef7b77c31d7031ffd433bb6c7d438ea51e5':
Synchronize access to ServiceDeclaration fields.
Change-Id: I46b300230a47fc96f90719786f7fb51a9d7468a7
Android Build Merger (Role) [Fri, 22 Apr 2016 21:24:38 +0000 (21:24 +0000)]
Merge "Synchronize access to ServiceDeclaration fields. am:
f8ecbbb am:
a37273e" into nyc-mr1-dev-plus-aosp
Calvin On [Fri, 22 Apr 2016 21:24:32 +0000 (21:24 +0000)]
Synchronize access to ServiceDeclaration fields. am:
f8ecbbb
am:
5576218
* commit '
5576218cafb4a39be3d0e70900d05bca5fbfe9a7':
Synchronize access to ServiceDeclaration fields.
Change-Id: Iac5477be509e2395b56888fb3bda2bc64f524517
Calvin On [Fri, 22 Apr 2016 21:24:32 +0000 (21:24 +0000)]
Synchronize access to ServiceDeclaration fields. am:
f8ecbbb
am:
a37273e
* commit '
a37273e506a477cd2d0cf11e7929420a87c93bda':
Synchronize access to ServiceDeclaration fields.
Change-Id: Ifd9109fb24ea9917f9322aa768f0541d9f23f587
Calvin On [Fri, 22 Apr 2016 21:21:58 +0000 (21:21 +0000)]
Synchronize access to ServiceDeclaration fields.
am:
f8ecbbb
* commit '
f8ecbbb375c6a41895e0144d8d8cd42587891570':
Synchronize access to ServiceDeclaration fields.
Change-Id: Ia0fda64b79de8bfcbe49da005364377b44eda25e
Calvin On [Fri, 22 Apr 2016 21:21:58 +0000 (21:21 +0000)]
Synchronize access to ServiceDeclaration fields.
am:
f8ecbbb
* commit '
f8ecbbb375c6a41895e0144d8d8cd42587891570':
Synchronize access to ServiceDeclaration fields.
Change-Id: I4838d4fd0b7d724de73dcc8ee57c528186f7c254
Calvin On [Wed, 20 Apr 2016 02:17:50 +0000 (19:17 -0700)]
Synchronize access to ServiceDeclaration fields.
ServiceDeclaration objects are accessed by both the binder thread
(addService, addCharacteristic, etc) and the GattService callback thread
(onServiceAdded, etc) and so must be made thread-safe.
Bug:
28201656
Change-Id: Ic2e4b5c21dafceb62f33738b781f908f502f60b3
OSDN Git Service
