OSDN Git Service
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
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
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: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"
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: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 [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 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 [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: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:20:41 +0000 (18:20 +0000)]
Merge "Log permission check failure as warning" into nyc-dev
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
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 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 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 [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
Ajay Panicker [Wed, 20 Apr 2016 21:14:33 +0000 (14:14 -0700)]
Properly label app as unregistered and add NPE protection
Bug:
28252914
Change-Id: I1e28a9af96bcf0d56914fcc676a8ff85400bc1c4
Marie Janssen [Fri, 22 Apr 2016 00:42:27 +0000 (17:42 -0700)]
resolve merge conflicts of
ce65d54 to nyc-dev-plus-aosp
Change-Id: Icce0b121a472fda7d49ff00eb70f73a53ce62b1d
Marie Janssen [Fri, 22 Apr 2016 00:25:57 +0000 (00:25 +0000)]
Merge "AVRCP: Use MediaController"
am:
1adfcb49b7
* commit '
1adfcb49b72f62b2b59e54219d0150edf8195695':
AVRCP: Use MediaController
Change-Id: If2bba78c2642bd4293acd5421b47c6e34230abe2
Marie Janssen [Fri, 22 Apr 2016 00:25:54 +0000 (00:25 +0000)]
AVRCP: Use MediaController
am:
2fc493d0ea
* commit '
2fc493d0ea2b504df25d783a488dfadfe301329e':
AVRCP: Use MediaController
Change-Id: I217d39edb9051fa400183317a9c7de66e8b9a2de
Marie Janssen [Fri, 22 Apr 2016 00:07:17 +0000 (00:07 +0000)]
Merge "AVRCP: Use MediaController"
Marie Janssen [Tue, 19 Apr 2016 14:12:42 +0000 (07:12 -0700)]
AVRCP: Use MediaController
RemoteController has been depreciated since M.
MediaController lets us track a lot more things and update data as the
state of audio changes.
This also should fix some bugs related to metadata display not happening
on startup / track change / app change.
Bug:
27178384
Bug:
27745277
Bug:
26837775
Bug:
27534794
Bug:
27153373
Change-Id: I246d9641a5e921ed4434495f5c2dfac67d568952
Marie Janssen [Tue, 19 Apr 2016 14:12:42 +0000 (07:12 -0700)]
AVRCP: Use MediaController
RemoteController has been depreciated since M.
MediaController lets us track a lot more things and update data as the
state of audio changes. We track and log some of these changes for bug
followup.
This also should fix some bugs related to metadata display not happening
on startup / track change / app change.
Bug:
27178384
Bug:
27745277
Bug:
26837775
Bug:
27534794
Bug:
27153373
Change-Id: I246d9641a5e921ed4434495f5c2dfac67d568952
Ajay Panicker [Thu, 21 Apr 2016 21:56:48 +0000 (21:56 +0000)]
Merge "Properly label app as unregistered and add NPE protection" am:
d4a672f597
am:
73122688c6
* commit '
73122688c60586956205665d43748da430bef95e':
Properly label app as unregistered and add NPE protection
Change-Id: Ib46783b7eba4a7c359970b6369e0c6aa4eb3c506
Seven Shen [Thu, 21 Apr 2016 21:54:27 +0000 (21:54 +0000)]
"DO NOT MERGE" Add write SMS protection
am:
60e306ba5c
* commit '
60e306ba5c132d5408ccae3a290e7cace020a49f':
"DO NOT MERGE" Add write SMS protection
Change-Id: I095cdaa7bd2674003f2fea3779fcce180af1f5f0
Ajay Panicker [Thu, 21 Apr 2016 21:54:26 +0000 (21:54 +0000)]
Merge "Properly label app as unregistered and add NPE protection"
am:
d4a672f597
* commit '
d4a672f5975a9712796fbcd76b23ee268df810e9':
Properly label app as unregistered and add NPE protection
Change-Id: Ifb75f1ac8e6bd7893a6dd904338b66871b60ac72
Ajay Panicker [Thu, 21 Apr 2016 21:24:33 +0000 (21:24 +0000)]
Merge "Properly label app as unregistered and add NPE protection"
Ajay Panicker [Wed, 20 Apr 2016 21:14:33 +0000 (14:14 -0700)]
Properly label app as unregistered and add NPE protection
Bug:
28252914
Change-Id: I1e28a9af96bcf0d56914fcc676a8ff85400bc1c4
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, 20 Apr 2016 01:20:51 +0000 (01:20 +0000)]
Add guest mode functionality (1/5)
am:
3558402
* commit '
3558402aae35c6b01c505be012d6736b0c758802':
Add guest mode functionality (1/5)
Change-Id: I0aaa943583d0d7ea464e74397740165e68dde979
Ajay Panicker [Fri, 18 Mar 2016 00:12:08 +0000 (17:12 -0700)]
Add guest mode functionality (1/5)
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 21:49:37 +0000 (21:49 +0000)]
Merge "Add guest mode functionality (1/4)" am:
fae54a8
am:
35d1580
* commit '
35d1580a975dc5e9b3d4a7c987e30eb7ab1763be':
Add guest mode functionality (1/4)
Change-Id: I0d91fba1ca24c0868f6372cd811ba998bed2d190
Ajay Panicker [Tue, 19 Apr 2016 21:45:45 +0000 (21:45 +0000)]
Merge "Add guest mode functionality (1/4)"
am:
fae54a8
* commit '
fae54a8c750cb66cc5970ad15966d12485dd0226':
Add guest mode functionality (1/4)
Change-Id: I258c1f62672ea83289ead61ce821ea71f2bb9e05
Ajay Panicker [Tue, 19 Apr 2016 21:29:47 +0000 (21:29 +0000)]
Merge "Add guest mode functionality (1/4)"
Ajay Panicker [Tue, 19 Apr 2016 20:50:37 +0000 (20:50 +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 am:
8a05cda -s ours
am:
ee763f7
* commit '
ee763f7526696a1c6eed92331397781d6eb7789c':
"DO NOT MERGE" Add write SMS protection
Change-Id: I6976c157f82f2f53ef55d2538f600cc2c91a8a3b
Seven Shen [Tue, 19 Apr 2016 20:50:37 +0000 (20:50 +0000)]
"DO NOT MERGE" Add write SMS protection am:
64745b1 am:
9accc36 am:
6c32c81 am:
b90c267 -s ours
am:
fed0765
* commit '
fed0765ad788e5ee92b46993d64e74f9f5ac431a':
"DO NOT MERGE" Add write SMS protection
Change-Id: I63c1e0185f2a2c315c3746def21cdc664a75c632
Ajay Panicker [Tue, 19 Apr 2016 20:48:43 +0000 (20:48 +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
am:
8a05cda -s ours
* commit '
8a05cdab974dc2c3eef692a721dcf8c2c892c92d':
"DO NOT MERGE" Add write SMS protection
Change-Id: Ida61f3ba3d91a67185cb06411251dea62d8eedc4
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
Seven Shen [Tue, 19 Apr 2016 20:41:24 +0000 (20:41 +0000)]
"DO NOT MERGE" Add write SMS protection am:
64745b1 am:
9accc36 am:
6c32c81
am:
b90c267 -s ours
* commit '
b90c26765772a8cf5cf20c86a89dc24490cb1ccd':
"DO NOT MERGE" Add write SMS protection
Change-Id: I7c3b38bd4ca8c28f20fc89ac936da6e2f0d80480
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
Marie Janssen [Tue, 19 Apr 2016 19:05:12 +0000 (19:05 +0000)]
AVRCP: Don\'t assume 0:00 on metadata change
am:
e2c4671
* commit '
e2c4671a8c5d01f053b5b8e0c728d69d561abdc2':
AVRCP: Don't assume 0:00 on metadata change
Change-Id: Ia37861ef9a1c089e23efcb9e5bce085f046d90ca
Marie Janssen [Fri, 15 Apr 2016 21:57:04 +0000 (14:57 -0700)]
AVRCP: Don't assume 0:00 on metadata change
When changing between apps, and changing between songs, the Media
framework sends us the position data before the metadata, so
setting it to 0 wipes out our position.
Fixes:
27745277
Change-Id: I2d309df424c8889928da9601b367d488bba89919
Adam Lesinski [Mon, 18 Apr 2016 23:35:36 +0000 (23:35 +0000)]
Merge "Implement new async response method for controller activity info" into nyc-dev
am:
049173d
* commit '
049173d572891011cc01f675d8bd0227ef55e381':
Implement new async response method for controller activity info
Change-Id: Iae86ab380cd053b3bcb678b858b5877d8900b40c
Adam Lesinski [Mon, 18 Apr 2016 23:27:08 +0000 (23:27 +0000)]
Merge "Implement new async response method for controller activity info" into nyc-dev
Ajay Panicker [Fri, 18 Mar 2016 00:12:08 +0000 (17:12 -0700)]
Add guest mode functionality (1/4)
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: I561225652509b29ac6b0d194a3a50e29c5569365
Marie Janssen [Sat, 16 Apr 2016 01:49:50 +0000 (01:49 +0000)]
Merge "AVRCP: Don\'t assume 0:00 on metadata change" am:
b81be7b
am:
bd7e0bf
* commit '
bd7e0bf92708a8da7166fa521b80ee830cc1f7aa':
AVRCP: Don't assume 0:00 on metadata change
Change-Id: If5b201739fbb6656b5d25930334c2af94d667531
Marie Janssen [Sat, 16 Apr 2016 01:47:16 +0000 (01:47 +0000)]
Merge "AVRCP: Don\'t assume 0:00 on metadata change"
am:
b81be7b
* commit '
b81be7b7f28ed966e5aa4600ee6bb4481b9e7720':
AVRCP: Don't assume 0:00 on metadata change
Change-Id: I89441bcdab9ae143eb60aa2dc9a31d7f13146972
Marie Janssen [Sat, 16 Apr 2016 01:40:24 +0000 (01:40 +0000)]
Merge "AVRCP: Don't assume 0:00 on metadata change"
Marie Janssen [Fri, 15 Apr 2016 21:57:04 +0000 (14:57 -0700)]
AVRCP: Don't assume 0:00 on metadata change
When changing between apps, and changing between songs, the Media
framework sends us the position data before the metadata, so
setting it to 0 wipes out our position.
Fixes:
27745277
Change-Id: I2d309df424c8889928da9601b367d488bba89919
Sanket Agarwal [Fri, 15 Apr 2016 23:20:03 +0000 (23:20 +0000)]
Handle all kinds of focuses and make fault tolerant to phone calls.
am:
bacd337
* commit '
bacd3374a5b2c2193e45aac0eafb8cc39762d9f5':
Handle all kinds of focuses and make fault tolerant to phone calls.
Change-Id: Ia5ba035536cfe8953fb7b6efc959ef06565c31b6
Baligh Uddin [Fri, 15 Apr 2016 23:20:03 +0000 (23:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
003f0b6 -s ours
* commit '
003f0b624af9474d43e594463d58bc795c98013e':
Import translations. DO NOT MERGE
Change-Id: I1c93a34ed4e2a5984985bbb7763d38bb0b598ecc
Sanket Agarwal [Thu, 7 Apr 2016 20:48:40 +0000 (13:48 -0700)]
Handle all kinds of focuses and make fault tolerant to phone calls.
Audio Focus Loss Transient: We stop music and wait for focus gain.
Audio Focus Loss Transient May Duck: We lower the volume (via Gain).
Sometimes phones do not resume even after sending play after the phone
call. This is possible if there is a race condition of when A2dp thinks
it got focus back vs phone actually releasing the call. To avoid this we
add retry logic to try playing again. This also avoids janky situations
when playing music will not initiate at first.
Bug: b/
28003743
Bug: b/
28065071
Change-Id: I1d31156d134d98959ff3044c98206c60515d7e5a
Baligh Uddin [Fri, 15 Apr 2016 22:35:07 +0000 (22:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Sanket Agarwal [Fri, 15 Apr 2016 21:24:24 +0000 (21:24 +0000)]
Merge "Rename btif audio_focus_state -> set_audio_focus_state." am:
93b6179 am:
c481822 am:
ef9aa9f
am:
16d0d57
* commit '
16d0d57b17f5f85d0f6a5d560f3ee3e904ef2a36':
Merge "Rename btif audio_focus_state -> set_audio_focus_state." am:
93b6179 am:
c481822 am:
ef9aa9f
Change-Id: I5c18a87d35d43fdafc57cffa0bcf4441d53ee5d9
Sanket Agarwal [Fri, 15 Apr 2016 20:13:48 +0000 (20:13 +0000)]
Merge "Rename btif audio_focus_state -> set_audio_focus_state." am:
93b6179 am:
c481822
am:
ef9aa9f
* commit '
ef9aa9f2514bafcaee96901dac2baffdf149e848':
Rename btif audio_focus_state -> set_audio_focus_state.
Change-Id: Ib250b9355a44eae5e6d2fbf575c2bd9c04ffbcd4
(cherry picked from commit
c7056ffc0c16fb35fda2cfc5adb51a736c9bb56a)
Adam Lesinski [Mon, 11 Apr 2016 21:50:36 +0000 (14:50 -0700)]
Implement new async response method for controller activity info
Bug:
26842468
Change-Id: I35e6bd6996d408aa2c8ccda754d5b2f05bcb8056
Treehugger Robot [Fri, 15 Apr 2016 20:10:35 +0000 (20:10 +0000)]
Merge "Rename btif audio_focus_state -> set_audio_focus_state." am:
93b6179
am:
c481822
* commit '
c481822da34ab6f8a566553fd73c337ab50c7e4b':
Rename btif audio_focus_state -> set_audio_focus_state.
Change-Id: I42d5f05d90d448116587973d1659772e91f9d304
Sanket Agarwal [Fri, 15 Apr 2016 20:07:17 +0000 (20:07 +0000)]
Merge "Rename btif audio_focus_state -> set_audio_focus_state."
am:
93b6179
* commit '
93b6179962049896cdbde0fb575d63e6482c5cb7':
Rename btif audio_focus_state -> set_audio_focus_state.
Change-Id: I54beae28905ba1b22c7a14dd424f045d560c712e
Treehugger Robot [Fri, 15 Apr 2016 19:57:21 +0000 (19:57 +0000)]
Merge "Rename btif audio_focus_state -> set_audio_focus_state."
Pavlin Radoslavov [Fri, 15 Apr 2016 19:20:04 +0000 (19:20 +0000)]
Add a missing null-pointer check in HeadsetService.stop()
am:
1b09c8c
* commit '
1b09c8cd4fa10c3f0918cb1e24bdd2fd60aeec88':
Add a missing null-pointer check in HeadsetService.stop()
Change-Id: I9c2c15ec6023d2a71ce9e00a156a9e891e69220b
Sanket Agarwal [Fri, 15 Apr 2016 19:10:01 +0000 (12:10 -0700)]
Rename btif audio_focus_state -> set_audio_focus_state.
Bug: b/
28065071
Change-Id: I0b84adfce2c72f03a81693e598c38e1469d7f022
Pavlin Radoslavov [Fri, 15 Apr 2016 17:49:41 +0000 (17:49 +0000)]
Merge "Add a missing null-pointer check in HeadsetService.stop()" am:
7f0f52c
am:
2144045
* commit '
214404558c638733aee9aec5a8481522ecaca86c':
Add a missing null-pointer check in HeadsetService.stop()
Change-Id: Ib80cb345580c497ae6352b80d299bb915c29c4d7
Pavlin Radoslavov [Fri, 15 Apr 2016 17:46:25 +0000 (17:46 +0000)]
Merge "Add a missing null-pointer check in HeadsetService.stop()"
am:
7f0f52c
* commit '
7f0f52c9c302ccb138d14cf60b782ea7e3a7cb51':
Add a missing null-pointer check in HeadsetService.stop()
Change-Id: I8f98d8282b66672af4cc6a2640364f12bcda6f97
Pavlin Radoslavov [Fri, 15 Apr 2016 00:49:45 +0000 (17:49 -0700)]
Add a missing null-pointer check in HeadsetService.stop()
Bug:
27678483
Change-Id: I288b905d6b3f827a94365d512305cd29e186f3d4
Pavlin Radoslavov [Fri, 15 Apr 2016 17:38:44 +0000 (17:38 +0000)]
Merge "Add a missing null-pointer check in HeadsetService.stop()"
Baligh Uddin [Fri, 15 Apr 2016 07:55:11 +0000 (00:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d2ac0ced0d0453a000307a544259d8e033e4914
Auto-generated-cl: translation import
Pavlin Radoslavov [Fri, 15 Apr 2016 00:49:45 +0000 (17:49 -0700)]
Add a missing null-pointer check in HeadsetService.stop()
Bug:
27678483
Change-Id: I288b905d6b3f827a94365d512305cd29e186f3d4
con [Thu, 14 Apr 2016 00:48:30 +0000 (00:48 +0000)]
Merge "Fix PEERS_MAC_ADDRESS permission for Ble Scanning." am:
a2129f1
am:
2369f00
* commit '
2369f00656165b339290879177c0b3104213bb9c':
Fix PEERS_MAC_ADDRESS permission for Ble Scanning.
Change-Id: Ib9d76c40e46b8bc95ca2beecaab9b6fb62084c0f
Calvin On [Thu, 14 Apr 2016 00:40:54 +0000 (00:40 +0000)]
Merge "Fix PEERS_MAC_ADDRESS permission for Ble Scanning."
am:
a2129f1
* commit '
a2129f1e4c73e4795627f4662a58b3d2d186848f':
Fix PEERS_MAC_ADDRESS permission for Ble Scanning.
Change-Id: I69f8fc96c4fc00bf18f4cb6daf79ca77ac1e9471
con [Thu, 14 Apr 2016 00:33:06 +0000 (00:33 +0000)]
Merge "Fix PEERS_MAC_ADDRESS permission for Ble Scanning."
Calvin On [Tue, 12 Apr 2016 22:43:59 +0000 (15:43 -0700)]
Fix PEERS_MAC_ADDRESS permission for Ble Scanning.
This changes the location permissions check to only throw a SecurityException
if *both* location and peers mac address permissions are missing.
Bug:
27837639
Change-Id: I5e10c8f0564d1f7edab23ad22dbd5aa5fdcbbf76
Calvin On [Wed, 13 Apr 2016 00:14:45 +0000 (00:14 +0000)]
Fix PEERS_MAC_ADDRESS permission for Ble Scanning.
am:
e041e1b
* commit '
e041e1b073d81516073223da4aef23e91cc823e7':
Fix PEERS_MAC_ADDRESS permission for Ble Scanning.
Change-Id: Ice6b8e751576badddcd814b8d9139af5d0ba387e
Calvin On [Tue, 12 Apr 2016 22:43:59 +0000 (15:43 -0700)]
Fix PEERS_MAC_ADDRESS permission for Ble Scanning.
This changes the location permissions check to only throw a SecurityException
if *both* location and peers mac address permissions are missing.
Bug:
27837639
Change-Id: I5e10c8f0564d1f7edab23ad22dbd5aa5fdcbbf76
Bill Yi [Sat, 9 Apr 2016 14:11:19 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE
am:
b402d0b -s ours
* commit '
b402d0b9e87988703a8c90e724ee325c9f065e9c':
Import translations. DO NOT MERGE
Change-Id: If548343d3fb4ac13d6313870990971b9534da6a4
Bill Yi [Sat, 9 Apr 2016 13:51:28 +0000 (06:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I33cceec5deb5b2f221c143167397a3ee0c60c332
Auto-generated-cl: translation import
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
Sanket Agarwal [Fri, 8 Apr 2016 00:28:54 +0000 (00:28 +0000)]
Bluetooth streaming should wait for AVRCP to start.
am:
f3db7dc
* commit '
f3db7dcf88a585d133f73b8579012f8217965728':
Bluetooth streaming should wait for AVRCP to start.
Change-Id: Id4a786f6b41e123d3bf4560fe21b8727d630cacd
OSDN Git Service
