OSDN Git Service
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
Marie Janssen [Fri, 22 Apr 2016 01:04:36 +0000 (01:04 +0000)]
resolve merge conflicts of
ce65d54 to nyc-dev-plus-aosp am:
123e1f3d62
am:
81f1d75f1e
* commit '
81f1d75f1e54881c8a5fa59aa4d69d70eae8df78':
AVRCP: Use MediaController
Change-Id: I801cf073752ecc1c78cf6edd82c2f02eeb2fed1f
Marie Janssen [Fri, 22 Apr 2016 01:02:14 +0000 (01:02 +0000)]
resolve merge conflicts of
ce65d54 to nyc-dev-plus-aosp
am:
123e1f3d62
* commit '
123e1f3d6252cb5505efaeaffd74c1f3895587df':
AVRCP: Use MediaController
Change-Id: Ie9c1227cf82e53801b0255a890bafa4d2d8a01f6
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:30:35 +0000 (00:30 +0000)]
Merge "AVRCP: Use MediaController am:
2fc493d0ea am:
3a576f8dac" into nyc-mr1-dev-plus-aosp
am:
3fe5bcc94e
* commit '
3fe5bcc94e3cf4c1703600fda9ad55bb8bb71af3':
Change-Id: Ibffe1e998a743a5aa514772d4db000bba6cdd781
Marie Janssen [Fri, 22 Apr 2016 00:30:35 +0000 (00:30 +0000)]
AVRCP: Use MediaController am:
2fc493d0ea am:
739879c469
am:
5b1a73761b
* commit '
5b1a73761bd09c16c211080b88e5ef9e26e1d123':
AVRCP: Use MediaController
Change-Id: I8d1a3f02a65142615373fa19d124c17b6bf6e8c0
Android Build Merger (Role) [Fri, 22 Apr 2016 00:28:20 +0000 (00:28 +0000)]
Merge "AVRCP: Use MediaController am:
2fc493d0ea am:
3a576f8dac" into nyc-mr1-dev-plus-aosp
Marie Janssen [Fri, 22 Apr 2016 00:28:14 +0000 (00:28 +0000)]
AVRCP: Use MediaController am:
2fc493d0ea
am:
3a576f8dac
* commit '
3a576f8dac142d6ca61c23986ba0697d238877f9':
AVRCP: Use MediaController
Change-Id: Id75e5f7aaedd6381d1ea9f8fff323c72c1640755
Marie Janssen [Fri, 22 Apr 2016 00:28:12 +0000 (00:28 +0000)]
AVRCP: Use MediaController am:
2fc493d0ea
am:
739879c469
* commit '
739879c4695ee6c3ee9ae6e306f091dc1a8bf011':
AVRCP: Use MediaController
Change-Id: Iaabaae1b5a583e4bc158efeb5762ab60997399c2
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: Ibc45bcea6a38686b0c28171ee56a1a0dcb4cbd34
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 22:04:38 +0000 (22:04 +0000)]
Merge "Properly label app as unregistered and add NPE protection" am:
d4a672f597 am:
73122688c6 am:
e2ef4d1782
am:
fba808f27e
* commit '
fba808f27e41eb172d519b39a546254f08229647':
Properly label app as unregistered and add NPE protection
Change-Id: I67995695b805f01de8487929f779268c94649667
Ajay Panicker [Thu, 21 Apr 2016 21:59:56 +0000 (21:59 +0000)]
Merge "Properly label app as unregistered and add NPE protection" am:
d4a672f597 am:
73122688c6
am:
e2ef4d1782
* commit '
e2ef4d17825129779ab46105af66a4a805c5e7df':
Properly label app as unregistered and add NPE protection
Change-Id: Id43f76d7e42f2e91bd3ebd7bce43863724ab596d
Seven Shen [Thu, 21 Apr 2016 21:59:07 +0000 (21:59 +0000)]
Merge ""DO NOT MERGE" Add write SMS protection am:
60e306ba5c am:
a482794b91" into nyc-mr1-dev-plus-aosp
am:
3cbd05f5f1 -s ours
* commit '
3cbd05f5f14a95574fc6d5cd8ee41a0395a708c7':
Change-Id: Ia1b9a7c0ac7025305c417cc4aef902007124a851
Seven Shen [Thu, 21 Apr 2016 21:59:07 +0000 (21:59 +0000)]
"DO NOT MERGE" Add write SMS protection am:
60e306ba5c am:
a511ea0b7a -s ours
am:
f1ed88b29e -s ours
* commit '
f1ed88b29ea402ba43415aaed21cceb7ff69740f':
"DO NOT MERGE" Add write SMS protection
Change-Id: Ie993ca04e0ac04173bca8245a211427a8e54f36a
Android Build Merger (Role) [Thu, 21 Apr 2016 21:56:56 +0000 (21:56 +0000)]
Merge ""DO NOT MERGE" Add write SMS protection am:
60e306ba5c am:
a482794b91" into nyc-mr1-dev-plus-aosp
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:56:48 +0000 (21:56 +0000)]
"DO NOT MERGE" Add write SMS protection am:
60e306ba5c
am:
a511ea0b7a -s ours
* commit '
a511ea0b7aa7978784b2aa545fe4062869024680':
"DO NOT MERGE" Add write SMS protection
Change-Id: I983c5a3a97cb71be140c511519e7a17a75819ad2
Seven Shen [Thu, 21 Apr 2016 21:56:48 +0000 (21:56 +0000)]
"DO NOT MERGE" Add write SMS protection am:
60e306ba5c
am:
a482794b91
* commit '
a482794b9107af8536d30ff015c9d169d192f3ef':
"DO NOT MERGE" Add write SMS protection
Change-Id: I4cf92ac926ad9f8932a926f24e43f8886a28576c
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: I0814706dcaa770fac4f12e522517f53eb17f02af
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"
Sanket Agarwal [Tue, 19 Apr 2016 22:57:22 +0000 (15:57 -0700)]
Race in hfp call termination when local termination faster than HFP
update.
If we make a call from the CarKitt and terminate it immidiately then the
CarKitt assumes no call has been created since phone hasnt replied yet
to the message from CarKitt. When it does reply, the CarKitt throws that
message away because it did not handle the intermediate state of
disconnection properly.
Bug: b/
28122608
Change-Id: I98105fd36914612fc96cba4d56db97b342822ffa
(cherry picked from commit
52297bafb15107ef66b7edeb1879df28b26e5cc9)
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 07:16:50 +0000 (07:16 +0000)]
Add guest mode functionality (1/5) am:
3558402 am:
6aeb4b1
am:
93ab20c
* commit '
93ab20c7608ac75f4dd47b2f5e0223b7400d7d5a':
Change-Id: I3979087b56f6f43f160fc37698ef3d266a8e39e5
Ajay Panicker [Wed, 20 Apr 2016 07:13:13 +0000 (07:13 +0000)]
Add guest mode functionality (1/5) am:
3558402
am:
6aeb4b1
* commit '
6aeb4b1a7db8f8fbc9e2d537906f9ad9f3b41c2c':
Change-Id: Ie932f6082ddada055eb2bd9f8b950464a3ef53dc
TreeHugger Robot [Wed, 20 Apr 2016 02:54:51 +0000 (02:54 +0000)]
Merge "Replace NOT_SUPPORTED string constants with empty strings."
Ajay Panicker [Wed, 20 Apr 2016 01:22:47 +0000 (01:22 +0000)]
Add guest mode functionality (1/5) am:
3558402aae am:
c8ae15d
am:
03be7be
* commit '
03be7be241d135dd0e7a324a575b72aaf1fa5ee9':
Add guest mode functionality (1/5)
Change-Id: I0825a2aab6a5541e8ed42b0ccb5ac6af8d0ec354
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 [Wed, 20 Apr 2016 01:20:26 +0000 (01:20 +0000)]
Add guest mode functionality (1/5) am:
3558402aae
am:
c8ae15d
* commit '
c8ae15d0627b8c69a29fc9b2f23fc3ac02af28c7':
Add guest mode functionality (1/5)
Change-Id: If8f309c5afee410c201e8639f01ed7f7bf0675fd
Ajay Panicker [Wed, 20 Apr 2016 00:52:03 +0000 (00:52 +0000)]
Add guest mode functionality (1/5)
am:
3558402aae
* commit '
3558402aae35c6b01c505be012d6736b0c758802':
Add guest mode functionality (1/5)
Change-Id: I2bef0061e1276dee86dd840d0e80888dea1c1adc
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 22:10:23 +0000 (22:10 +0000)]
Merge "Add guest mode functionality (1/4)" am:
fae54a8 am:
35d1580 am:
6265c0e
am:
7ace4f3
* commit '
7ace4f320fcef8259b5ad5dca8f431b90faa6dee':
Add guest mode functionality (1/4)
Change-Id: Ie8b07de696d80d83ce5622e0d78b2e14533ad65c
Ajay Panicker [Tue, 19 Apr 2016 22:03:13 +0000 (22:03 +0000)]
Merge "Add guest mode functionality (1/4)" am:
fae54a8 am:
35d1580
am:
6265c0e
* commit '
6265c0e229c7a5ac9143c100c4d654142043d145':
Add guest mode functionality (1/4)
Change-Id: I017983f8d6eaa315b97487d656676547a1fafdec
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 21:02:22 +0000 (21:02 +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 am:
caad60f
am:
a50d809 -s ours
* commit '
a50d8094adaf1ebb0da68913641ed26c11f9b011':
Change-Id: I2366e083aa0dd3b00ba06f287992660a25256b06
Seven Shen [Tue, 19 Apr 2016 21:02:22 +0000 (21:02 +0000)]
"DO NOT MERGE" Add write SMS protection am:
64745b1 am:
9accc36 am:
6c32c81 am:
b90c267 -s ours am:
fed0765 am:
ac17901
am:
03c169a -s ours
* commit '
03c169aa9a0a9f0e82275dcdbb5dbb4824969454':
Change-Id: I6026d0d99456a53e5a32c2eafbe5c038a35bd7b8
Ajay Panicker [Tue, 19 Apr 2016 21:02:22 +0000 (21:02 +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 am:
294e9d9 -s ours
am:
8079fe8 -s ours
* commit '
8079fe8058c62064205526f96ffcf811d0a5ddce':
"DO NOT MERGE" Add write SMS protection
Change-Id: I8cc567becfd5498b8c164f5831d9f1ee8675e1d8
Seven Shen [Tue, 19 Apr 2016 21:02:21 +0000 (21:02 +0000)]
"DO NOT MERGE" Add write SMS protection am:
64745b1 am:
9accc36 am:
6c32c81 am:
b90c267 -s ours am:
fed0765 am:
b6d79f7 -s ours
am:
9e8901d -s ours
* commit '
9e8901d7f4dc754da6ec9c688956a8814b2cb99c':
"DO NOT MERGE" Add write SMS protection
Change-Id: Ide2dd7f5d637cf426f2a35c4bd3e65e423a064e0
Ajay Panicker [Tue, 19 Apr 2016 20:57:17 +0000 (20:57 +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
am:
caad60f
* commit '
caad60f028ca811ad72fc0006c5b70744bd7031c':
Change-Id: I341fbd2f0949a3a6cd7285f13079ce2e3755dfbb
Seven Shen [Tue, 19 Apr 2016 20:57:17 +0000 (20:57 +0000)]
"DO NOT MERGE" Add write SMS protection am:
64745b1 am:
9accc36 am:
6c32c81 am:
b90c267 -s ours am:
fed0765
am:
ac17901
* commit '
ac17901f5360adba75c5fa3e530b14c49cc89a74':
Change-Id: I70bb23d7315b6c19ce78b096a16ca606ff3de7be
Ajay Panicker [Tue, 19 Apr 2016 20:53:57 +0000 (20:53 +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
am:
294e9d9 -s ours
* commit '
294e9d924c365dc063bb520b1f15221f3e83cac9':
"DO NOT MERGE" Add write SMS protection
Change-Id: I77343a363a936c883fd9756a34ba52e1900bd2ba
Seven Shen [Tue, 19 Apr 2016 20:53:56 +0000 (20:53 +0000)]
"DO NOT MERGE" Add write SMS protection am:
64745b1 am:
9accc36 am:
6c32c81 am:
b90c267 -s ours am:
fed0765
am:
b6d79f7 -s ours
* commit '
b6d79f70dc21b259d3004533027c75526b5fb97a':
"DO NOT MERGE" Add write SMS protection
Change-Id: I638c2879c94ff9de0a6a9a2f41c56130da8d73c7
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:50:29 +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: I6004e17e53a5e44206eaf45cb0a498cf6ea8ff4b
Seven Shen [Tue, 19 Apr 2016 20:50:29 +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: If59497f9e755c99c9fa7d17fc2bb33b278343897
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:11:49 +0000 (19:11 +0000)]
AVRCP: Don\'t assume 0:00 on metadata change am:
e2c4671 am:
7101dea
am:
250a5aa
* commit '
250a5aa5efaa1568e34f33d92d13ea5f16f924fb':
Change-Id: I8351eed0cbf76112c1c38ac1bbf86bf99a3e90eb
Marie Janssen [Tue, 19 Apr 2016 19:11:48 +0000 (19:11 +0000)]
AVRCP: Don\'t assume 0:00 on metadata change am:
e2c4671 am:
23f1073
am:
87ba6b1
* commit '
87ba6b15c7a414479068054b844bc6c7658757f7':
AVRCP: Don't assume 0:00 on metadata change
Change-Id: I5d3710c71b5f71fd97628f3762faa70735d3d330
Marie Janssen [Tue, 19 Apr 2016 19:11:23 +0000 (19:11 +0000)]
AVRCP: Don\'t assume 0:00 on metadata change am:
e2c4671
am:
7101dea
* commit '
7101deae3eb11e75e0a02ba7aeb1c73b201c191d':
Change-Id: I5d62a5f29829f5bd9264a1f99220a2c6fd0f82a9
Marie Janssen [Tue, 19 Apr 2016 19:08:23 +0000 (19:08 +0000)]
AVRCP: Don\'t assume 0:00 on metadata change am:
e2c4671
am:
23f1073
* commit '
23f107322665a0b299f3937fe7904a0c6b02df0b':
AVRCP: Don't assume 0:00 on metadata change
Change-Id: Id5e2e5f2d93d42a5b106dc1d6072c027fddd264b
Marie Janssen [Tue, 19 Apr 2016 19:05:13 +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: I4c7bc9f8fda8f88817a6c42d1189193f99ba9ffd
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
Sanket Agarwal [Mon, 18 Apr 2016 21:59:37 +0000 (14:59 -0700)]
Replace NOT_SUPPORTED string constants with empty strings.
AVRCP was defining default state strings as NOT_SUPPORTED and hence the
UI would show NOT_SUPPORTED as the string for album/song info when no
player is selected on the phone. Replacing these strings with empty
helps UI make a more informed decision.
Bug: b/
28120051
Change-Id: Ia8017dce784160d637a6653f70addb5258e7871e
(cherry picked from commit
00a113ff764ac9ae8517f54d79d917302ebf243b)
Adam Lesinski [Mon, 18 Apr 2016 23:50:18 +0000 (23:50 +0000)]
Merge "Implement new async response method for controller activity info" into nyc-dev am:
049173d am:
bea72a9
am:
488897c
* commit '
488897cb4f681e1d67bdd3c5d31360a87a361575':
Change-Id: I9a5a87e38b310247d14e5f45231d08f1a4cf0be8
Sanket Agarwal [Mon, 18 Apr 2016 22:35:23 +0000 (15:35 -0700)]
A2dpSink sends CONNECTED instead of DISCONNECTED when connection
timeout
When a timeout happens for an outgoing A2DP Sink connection we are (most
likely a typo) sending a CONNECTED instead of DISCONNECTED event. This
confuses the UI and shows it as connected instead of disconnected.
Change-Id: I2fc5a9df86781b45e5c5ff9368a7c49c6c910294
(cherry picked from commit
996bedb82d33c56e1f1c24986c56c166afc9c77a)
Adam Lesinski [Mon, 18 Apr 2016 23:43:43 +0000 (23:43 +0000)]
Merge "Implement new async response method for controller activity info" into nyc-dev am:
049173d
am:
bea72a9
* commit '
bea72a9af0f75a27a2565f666ae595a59515e23c':
Change-Id: I9db5382587de00b60a007b50716a527451b975c9
Adam Lesinski [Mon, 18 Apr 2016 23:40:32 +0000 (23:40 +0000)]
Merge "Implement new async response method for controller activity info" into nyc-dev am:
049173d am:
ef1772a
am:
d5537ef
* commit '
d5537ef83ed5b9d9783b802742f0fd5f10b73839':
Implement new async response method for controller activity info
Change-Id: I9c4d4ece75c56cd0bbdbdca8328fec65bc031920
Adam Lesinski [Mon, 18 Apr 2016 23:37:38 +0000 (23:37 +0000)]
Merge "Implement new async response method for controller activity info" into nyc-dev am:
049173d
am:
ef1772a
* commit '
ef1772ab9862e830067d91dc5c806f9fde4c0750':
Implement new async response method for controller activity info
Change-Id: I0614d54252edf836591133c510d2a3fe2385f249
Adam Lesinski [Mon, 18 Apr 2016 23:35:37 +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: Ibc6ee9798cf3d46dab1bbf3cc3910423242d3699
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:52:18 +0000 (01:52 +0000)]
Merge "AVRCP: Don\'t assume 0:00 on metadata change" am:
b81be7b am:
bd7e0bf
am:
322c601
* commit '
322c6019a835508b668b55618b7fd8e17309fe86':
AVRCP: Don't assume 0:00 on metadata change
Change-Id: I50fee858953e16dde4764074c94a43b4d4505755
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:25:10 +0000 (23:25 +0000)]
Handle all kinds of focuses and make fault tolerant to phone calls. am:
bacd337
am:
9d925df
* commit '
9d925df92e98d88695b5129ce0b257f6095e4a39':
Handle all kinds of focuses and make fault tolerant to phone calls.
Change-Id: I063dce2933e55846d131eb590d83df3f1125c234
Baligh Uddin [Fri, 15 Apr 2016 23:25:10 +0000 (23:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
003f0b6 -s ours
am:
d9ebd53 -s ours
* commit '
d9ebd53f6702cb10ddb56ff87c21c8b64d93c8b7':
Import translations. DO NOT MERGE
Change-Id: Id7a350d01df4d24a5f55e772b5fedca2049e15f9
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
OSDN Git Service
