OSDN Git Service
Jaewan Kim [Thu, 22 Sep 2016 02:55:15 +0000 (02:55 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am:
64b7b1522e -s ours
am:
5abd69e59a
Change-Id: I00d1e9f1c7f41f0f15429a159833c8cbaf789342
Jaewan Kim [Thu, 22 Sep 2016 02:54:22 +0000 (02:54 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
4e9af38ec4 -s ours
am:
031fb04776
Change-Id: I05beb9fff4527be83812122be9d783c9a109cb01
Elliot Waite [Thu, 22 Sep 2016 02:19:41 +0000 (02:19 +0000)]
Merge "Revert fixed at links." into nyc-dev
Ajay Panicker [Thu, 22 Sep 2016 01:37:37 +0000 (01:37 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am:
f78ff48d0d -s ours am:
7cd1668893 am:
a5e128ba97
am:
94c08c2bed -s ours
Change-Id: I92cf4d41b8adae4021b9a2eaf99f56015c995148
Ajay Panicker [Thu, 22 Sep 2016 01:36:41 +0000 (01:36 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
27b3d578b9 -s ours am:
57fdbb97a6 am:
2cf025f976
am:
9c7ac98157 -s ours
Change-Id: I3bc0085154ca14e3bee294de6109e41e1ccd9fa5
Ajay Panicker [Thu, 22 Sep 2016 01:35:54 +0000 (01:35 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am:
447ac4b31d am:
4431d6cb5b
am:
852e5a43b9 -s ours
Change-Id: I2327ac15699e1734d4cf3ae4e1f7e8a5aedc0b5b
Ajay Panicker [Thu, 22 Sep 2016 01:34:51 +0000 (01:34 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1
am:
8be4dc7e16 -s ours
Change-Id: Ic7a46031556a3ae24d8f56808c0b9c631cf931a4
Adarsh Fernando [Thu, 22 Sep 2016 00:55:31 +0000 (17:55 -0700)]
Removing a temporary redirect for /ndk/guides/cmake.html
Change-Id: I45d9aa20bca3e37c4240601ae75cca24081a63f6
Elliot Waite [Wed, 21 Sep 2016 22:47:30 +0000 (15:47 -0700)]
Revert fixed at links.
This reverts commit
c4ae7827e26ab3d0ac340d896c28c166da860fdb.
Change-Id: I65729721ced7fc04d0b9691b63520007adddee29
Stuart Scott [Wed, 21 Sep 2016 22:58:53 +0000 (22:58 +0000)]
Merge "Continue if package is not in system" into nyc-dr1-dev
Jaewan Kim [Wed, 21 Sep 2016 22:54:04 +0000 (22:54 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev
am:
8ba2549592
Change-Id: I5593d4149bbd8235d42a0cb2b23c9fb091aa70f9
Jaewan Kim [Wed, 21 Sep 2016 22:54:02 +0000 (22:54 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev
am:
22c9458a13
Change-Id: Ie3279270215a99f9b7f98dc6325f4cc7c431cc9b
Jaewan Kim [Wed, 21 Sep 2016 22:53:59 +0000 (22:53 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session
am:
09c3df004b
Change-Id: Ib883850c8554fae35e29313e2ea6a19e3592148c
Jaewan Kim [Wed, 21 Sep 2016 22:53:58 +0000 (22:53 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session
am:
c282c4f106
Change-Id: I8ec1e339f50ab7d017bcf91cddefc2b0f569c696
Jaewan Kim [Wed, 21 Sep 2016 22:53:42 +0000 (22:53 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev
am:
64b7b1522e -s ours
Change-Id: I1aaad42b1a3a82753aca4d55d743116cc3b674bd
Jaewan Kim [Wed, 21 Sep 2016 22:53:38 +0000 (22:53 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session
am:
4e9af38ec4 -s ours
Change-Id: I416843909b0b49378d8b6dc4eb92032ae7a1418e
Jaewan Kim [Wed, 21 Sep 2016 22:53:29 +0000 (22:53 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev
am:
162c80bf0c
Change-Id: Icbabe6e78468cb4138b8cab77ff06432628739c0
Jaewan Kim [Wed, 21 Sep 2016 22:53:17 +0000 (22:53 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session
am:
6a1567c267
Change-Id: Ic2bdd07b94fd9d6bdaa701d3e719904a2f84cc4d
Adarsh Fernando [Wed, 21 Sep 2016 22:45:04 +0000 (15:45 -0700)]
Found a couple of more references to Android N.
Bug:
31647521
Change-Id: I9f8c40e43cb79656761f237a0f144ab8a9b4c5d5
Adarsh Fernando [Wed, 21 Sep 2016 22:26:48 +0000 (22:26 +0000)]
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev
Jaewan Kim [Wed, 21 Sep 2016 22:21:03 +0000 (22:21 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev
Adarsh Fernando [Wed, 21 Sep 2016 20:56:37 +0000 (13:56 -0700)]
Docs: Cleanup of Preview language in Android 7.0 docs.
bug:
31647521
Change-Id: I882f7d7cb5bb1ddcc18ddbc29b17edbbbd84131a
Ajay Panicker [Wed, 21 Sep 2016 21:58:43 +0000 (21:58 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am:
f78ff48d0d -s ours am:
7cd1668893
am:
a5e128ba97
Change-Id: Ibfdcd322fef7b589e6e6c14f25fb92b8b7ed43a1
Ajay Panicker [Wed, 21 Sep 2016 21:57:48 +0000 (21:57 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
27b3d578b9 -s ours am:
57fdbb97a6
am:
2cf025f976
Change-Id: Id5edc69b9594289566590d869ad0b4c0219fb242
Ajay Panicker [Wed, 21 Sep 2016 21:56:51 +0000 (21:56 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am:
447ac4b31d
am:
4431d6cb5b
Change-Id: Ieeff1ea88cfef281c3ebf42312261a601c18e59d
Ajay Panicker [Wed, 21 Sep 2016 21:56:49 +0000 (21:56 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am:
c119a677c4
am:
35d1b45b0f
Change-Id: I0417ea58275604b9ac1fca6e79c14697d965397a
Ajay Panicker [Wed, 21 Sep 2016 21:55:52 +0000 (21:55 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4
am:
46442d1be1
Change-Id: I50616eafb788247b103911bd5ac899899e3ba47c
Ajay Panicker [Wed, 21 Sep 2016 21:55:46 +0000 (21:55 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
786e2694b1
am:
8fd324c33f
Change-Id: Idbe61150d738e5e41d5606fa6d89c0a5b604a86d
TreeHugger Robot [Wed, 21 Sep 2016 21:47:00 +0000 (21:47 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev
TreeHugger Robot [Wed, 21 Sep 2016 21:46:51 +0000 (21:46 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev
TreeHugger Robot [Wed, 21 Sep 2016 21:46:41 +0000 (21:46 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev
Ajay Panicker [Wed, 21 Sep 2016 21:31:00 +0000 (21:31 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am:
f78ff48d0d -s ours
am:
7cd1668893
Change-Id: Ibe7158ab142e8c566b05dc370c77393231f1f507
Ajay Panicker [Wed, 21 Sep 2016 21:30:13 +0000 (21:30 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
27b3d578b9 -s ours
am:
57fdbb97a6
Change-Id: I73e6ebd27ecabc7510ef9661eb1fcacdb2bafccf
Ajay Panicker [Wed, 21 Sep 2016 21:15:59 +0000 (21:15 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev
am:
c119a677c4
Change-Id: I7f1a7c5d09d38cfbd3fca0ee158f6401233e8f6d
Ajay Panicker [Wed, 21 Sep 2016 21:15:56 +0000 (21:15 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
am:
786e2694b1
Change-Id: Ia40c3fc57b5c17910c67faf40b940bdd944dd4e3
Ajay Panicker [Wed, 21 Sep 2016 21:15:40 +0000 (21:15 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev
am:
f78ff48d0d -s ours
Change-Id: I82e447c8dbbabd40977805bc1d233de832296e6b
Ajay Panicker [Wed, 21 Sep 2016 21:15:37 +0000 (21:15 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
am:
27b3d578b9 -s ours
Change-Id: Ia29f66f121813b3e03a16a665f7bdae2d75ed09b
Ajay Panicker [Wed, 21 Sep 2016 21:15:35 +0000 (21:15 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev
am:
447ac4b31d
Change-Id: I939008cb6b770c4273e258d91e2916a1823ec6fb
Ajay Panicker [Wed, 21 Sep 2016 21:15:32 +0000 (21:15 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
am:
85bc33a8f4
Change-Id: I2194d4c01e8bff53a7d6fcdf25513b216a511155
Ajay Panicker [Wed, 21 Sep 2016 21:08:07 +0000 (21:08 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev
Ajay Panicker [Wed, 21 Sep 2016 21:08:04 +0000 (21:08 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev
Ajay Panicker [Wed, 21 Sep 2016 21:08:01 +0000 (21:08 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev
Josh Horwich [Wed, 21 Sep 2016 21:04:43 +0000 (14:04 -0700)]
Docs: Fix missing space
A space got lost when this document got edited recently, this
simply puts it back.
Bug: None
Test: None
Change-Id: I87ee55322d90f6113c3611050d5f5ce1a43bdccb
Stuart Scott [Wed, 21 Sep 2016 21:04:22 +0000 (14:04 -0700)]
Continue if package is not in system
bug:
29546655
Change-Id: Ieb17534d60db4643180b915f9b10b0c79a2224e2
Fan Zhang [Wed, 21 Sep 2016 15:38:12 +0000 (15:38 +0000)]
Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev
am:
32bd448cc1
Change-Id: I11d2bdcbd0635510ae7a53574749404a96162773
Fan Zhang [Wed, 21 Sep 2016 15:38:08 +0000 (15:38 +0000)]
Fix NPE for WifiConfiguration in AccessPoint.
am:
51365c3b4c
Change-Id: I7d653816e70f38f0cce3a6bc8f0eaade8593866a
Fan Zhang [Wed, 21 Sep 2016 15:29:56 +0000 (15:29 +0000)]
Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev
Lorenzo Colitti [Wed, 21 Sep 2016 09:42:05 +0000 (09:42 +0000)]
Merge "Rematch wifi networks when the avoid bad wifi setting changes." into nyc-dr1-dev
Lorenzo Colitti [Wed, 21 Sep 2016 05:22:33 +0000 (14:22 +0900)]
Rematch wifi networks when the avoid bad wifi setting changes.
Currently, when the avoid bad wifi setting changes, we rematch
all networks and requests, but do not update any NetworkFactories
with new scores. This means that if a wifi network's score goes
down as a result of enabling bad wifi avoidance, we will not look
for another network (e.g., cell data) to satisfy its requests.
This makes it so that when the user enables avoiding bad wifi,
we will attempt to bring up cell data will if it is not already
connected.
Bug:
31075769
Change-Id: Ie5b685be8676999adea8c9ecbbc1abb92f81a74f
Ajay Panicker [Wed, 21 Sep 2016 05:06:53 +0000 (05:06 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5 am:
fe616288dc -s ours am:
3a20f7ceac am:
be2651bb6b am:
a7176293fd am:
e60aa74d44 -s ours
am:
e053061edd
Change-Id: I3b271244a7be75f7f652f8192ba337352d946462
Ajay Panicker [Wed, 21 Sep 2016 04:14:28 +0000 (04:14 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113 am:
b2094f7c37 -s ours am:
6b16f71975 am:
dddb99f020 am:
cdf3126615 am:
bd752f7d88 -s ours
am:
da12b4b0f0
Change-Id: I9cf2a8223db41299b5c4089437a0ff3cc14418e4
Ajay Panicker [Wed, 21 Sep 2016 04:13:46 +0000 (04:13 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5 am:
fe616288dc -s ours am:
3a20f7ceac am:
be2651bb6b am:
a7176293fd
am:
e60aa74d44 -s ours
Change-Id: Id0fe233f9b700c7b41fe864699b54727108b6ecf
Ajay Panicker [Wed, 21 Sep 2016 04:13:25 +0000 (04:13 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b am:
9a66565324 -s ours am:
dcb78c9cf1 am:
3ed9e7693d am:
853e39d3d9 am:
232824e01c -s ours
am:
257cf16de3
Change-Id: I1677fdf4dcfe9fe96de22f4cdfb67225b4d86a2e
Ajay Panicker [Wed, 21 Sep 2016 04:02:02 +0000 (04:02 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5 am:
fe616288dc -s ours am:
3a20f7ceac am:
be2651bb6b
am:
a7176293fd
Change-Id: I480a3e8cfc363570ecb10d5cca2b0e1a95472f51
Ajay Panicker [Wed, 21 Sep 2016 03:44:15 +0000 (03:44 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5 am:
fe616288dc -s ours am:
3a20f7ceac
am:
be2651bb6b
Change-Id: I7ffc9b61fbfe670a68049b94a05415abec38e36e
Ajay Panicker [Wed, 21 Sep 2016 03:30:43 +0000 (03:30 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db am:
b367200be4 am:
ef74f3b079 -s ours am:
0f464f9d77 am:
1682f67177 am:
13ac17ab3a am:
ec220f645f -s ours
am:
e460ea15e6
Change-Id: I37c93b23735ea728ce5cfd77ae930f6834a6cfe5
Ajay Panicker [Wed, 21 Sep 2016 03:27:48 +0000 (03:27 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660 am:
3d995d6f5f -s ours am:
4f77ca16e4 -s ours am:
959b1aa5b9 am:
7caccc107f am:
1dcec33349 -s ours am:
2ef2d90eaa am:
b2e8361c50 am:
c147db7a79 am:
3e238e3396 -s ours
am:
998001b4b2
Change-Id: I3fa54c60c1172c2e934fa8887413c3767f82e6d6
Ajay Panicker [Wed, 21 Sep 2016 03:26:15 +0000 (03:26 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113 am:
b2094f7c37 -s ours am:
6b16f71975 am:
dddb99f020 am:
cdf3126615
am:
bd752f7d88 -s ours
Change-Id: I5657111479e2ac6df3f856c7a624421e37ec731d
Ajay Panicker [Wed, 21 Sep 2016 03:25:07 +0000 (03:25 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours am:
cb970f408e -s ours am:
fafa73a8ac am:
0639d05e55 am:
a701b1b6f6 -s ours am:
afafdff50e am:
d46605ab09 am:
fc7822f58a am:
93a622150f -s ours
am:
834f982c97
Change-Id: I01516b02b44a32a1f140143ef118f623905fca1e
Ajay Panicker [Wed, 21 Sep 2016 03:23:38 +0000 (03:23 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5 am:
fe616288dc -s ours
am:
3a20f7ceac
Change-Id: I10c29e499b19e247dedc4e65b3d1d4bd42a7eb03
Ajay Panicker [Wed, 21 Sep 2016 03:17:36 +0000 (03:17 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b am:
9a66565324 -s ours am:
dcb78c9cf1 am:
3ed9e7693d am:
853e39d3d9
am:
232824e01c -s ours
Change-Id: Ic4636b08ecc94720c7b013769436668167b6fca8
Ajay Panicker [Wed, 21 Sep 2016 03:15:14 +0000 (03:15 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db am:
b367200be4 am:
ef74f3b079 -s ours am:
0f464f9d77 am:
1682f67177 am:
13ac17ab3a
am:
ec220f645f -s ours
Change-Id: If90aff1167803a965e938f9e174ec1df09401b85
Ajay Panicker [Wed, 21 Sep 2016 03:13:20 +0000 (03:13 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660 am:
3d995d6f5f -s ours am:
4f77ca16e4 -s ours am:
959b1aa5b9 am:
7caccc107f am:
1dcec33349 -s ours am:
2ef2d90eaa am:
b2e8361c50 am:
c147db7a79
am:
3e238e3396 -s ours
Change-Id: I52e1cfccc31b8169eaeb4e4aacc67b97b0e39cec
Ajay Panicker [Wed, 21 Sep 2016 03:12:09 +0000 (03:12 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113 am:
b2094f7c37 -s ours am:
6b16f71975 am:
dddb99f020
am:
cdf3126615
Change-Id: I37fdf0eb48bd07dc07b8716040d2f286304bce70
Ajay Panicker [Wed, 21 Sep 2016 03:12:02 +0000 (03:12 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours am:
cb970f408e -s ours am:
fafa73a8ac am:
0639d05e55 am:
a701b1b6f6 -s ours am:
afafdff50e am:
d46605ab09 am:
fc7822f58a
am:
93a622150f -s ours
Change-Id: If89cb759ef536ee618a3ab6121fde4e3dbc6dac3
Ajay Panicker [Wed, 21 Sep 2016 03:10:15 +0000 (03:10 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5
am:
fe616288dc -s ours
Change-Id: I858b0c0f7d1b9e723857169bd7f29a55d82e0136
Ajay Panicker [Wed, 21 Sep 2016 02:56:53 +0000 (02:56 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113 am:
b2094f7c37 -s ours am:
6b16f71975
am:
dddb99f020
Change-Id: Ie45bd66830e6e3e68be7e3f2692911ea4fa82fa9
Ajay Panicker [Wed, 21 Sep 2016 02:55:36 +0000 (02:55 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485
am:
95b604ccb5
Change-Id: I78d80c17e2b7a0b6d0d611f738a3b880dd74dab0
Ajay Panicker [Wed, 21 Sep 2016 02:54:19 +0000 (02:54 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b am:
9a66565324 -s ours am:
dcb78c9cf1 am:
3ed9e7693d
am:
853e39d3d9
Change-Id: I1f1f4f44161525bb4ee7fbbcabdd5a6e346d3b8a
Ajay Panicker [Wed, 21 Sep 2016 02:40:31 +0000 (02:40 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db am:
b367200be4 am:
ef74f3b079 -s ours am:
0f464f9d77 am:
1682f67177
am:
13ac17ab3a
Change-Id: I495579b3cca396dd5fb6a628bedb5e5be4916b26
Ajay Panicker [Wed, 21 Sep 2016 02:38:56 +0000 (02:38 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660 am:
3d995d6f5f -s ours am:
4f77ca16e4 -s ours am:
959b1aa5b9 am:
7caccc107f am:
1dcec33349 -s ours am:
2ef2d90eaa am:
b2e8361c50
am:
c147db7a79
Change-Id: I52a9da62a72e21a052561b8aa1760bedb8a4b8c6
Elliot Waite [Wed, 21 Sep 2016 02:38:10 +0000 (02:38 +0000)]
Merge "Fix some at links." into nyc-dev
am:
edc31f9593
Change-Id: I01ae10ce4ee5f0e224bd0ceb36c8e3dffb6c5aff
Elliot Waite [Wed, 21 Sep 2016 02:38:06 +0000 (02:38 +0000)]
Fix some at links.
am:
28d87163e1
Change-Id: I90f11e3705c546a8d37cf67a2b4de0a379497568
Ajay Panicker [Wed, 21 Sep 2016 02:37:38 +0000 (02:37 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours am:
cb970f408e -s ours am:
fafa73a8ac am:
0639d05e55 am:
a701b1b6f6 -s ours am:
afafdff50e am:
d46605ab09
am:
fc7822f58a
Change-Id: I7b744f3d3c5e816a1722b20bad66b924911b8a36
Ajay Panicker [Wed, 21 Sep 2016 02:37:35 +0000 (02:37 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113 am:
b2094f7c37 -s ours
am:
6b16f71975
Change-Id: I2f7ec847c4d781a80e950c3ede965456163c90f9
Ajay Panicker [Wed, 21 Sep 2016 02:35:59 +0000 (02:35 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b am:
9a66565324 -s ours am:
dcb78c9cf1
am:
3ed9e7693d
Change-Id: Ie6c2f8cf182d0787ffc401800134f30fde903e3b
Ajay Panicker [Wed, 21 Sep 2016 02:24:44 +0000 (02:24 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db am:
b367200be4 am:
ef74f3b079 -s ours am:
0f464f9d77
am:
1682f67177
Change-Id: I75da25a30cc7be28b3a2d332fa5ca7fc18322dfc
Ajay Panicker [Wed, 21 Sep 2016 02:24:08 +0000 (02:24 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b am:
9a66565324 -s ours
am:
dcb78c9cf1
Change-Id: I196204c683a0eacbe08103b383dcd9cb1435a43d
Ajay Panicker [Wed, 21 Sep 2016 02:23:37 +0000 (02:23 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660 am:
3d995d6f5f -s ours am:
4f77ca16e4 -s ours am:
959b1aa5b9 am:
7caccc107f am:
1dcec33349 -s ours am:
2ef2d90eaa
am:
b2e8361c50
Change-Id: I679522909e4498442cb2e227ac0b7c45fbc47ebf
Ajay Panicker [Wed, 21 Sep 2016 02:22:08 +0000 (02:22 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev
am:
60bf672485
Change-Id: Iba3b6ff14fdab510e1e0c8fae7298be290e93bf1
Ajay Panicker [Wed, 21 Sep 2016 02:21:15 +0000 (02:21 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours am:
cb970f408e -s ours am:
fafa73a8ac am:
0639d05e55 am:
a701b1b6f6 -s ours am:
afafdff50e
am:
d46605ab09
Change-Id: Icc3905c1133d4ed3b3ea40f95bde021933adcd02
Elliot Waite [Wed, 21 Sep 2016 02:15:09 +0000 (02:15 +0000)]
Merge "Fix some at links." into nyc-dev
Ajay Panicker [Wed, 21 Sep 2016 02:09:09 +0000 (02:09 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113
am:
b2094f7c37 -s ours
Change-Id: I202fe25cf207a5063f897d13617fc0a03fe2ca83
Ajay Panicker [Wed, 21 Sep 2016 02:03:46 +0000 (02:03 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db am:
b367200be4 am:
ef74f3b079 -s ours
am:
0f464f9d77
Change-Id: I0c7d7db1dcc585477d5f7841137b5603270eabe6
Ajay Panicker [Wed, 21 Sep 2016 02:02:47 +0000 (02:02 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660 am:
3d995d6f5f -s ours am:
4f77ca16e4 -s ours am:
959b1aa5b9 am:
7caccc107f am:
1dcec33349 -s ours
am:
2ef2d90eaa
Change-Id: Iff03e10920f3d42246b7b7e2c172ac30b3beaccb
Ajay Panicker [Wed, 21 Sep 2016 02:01:38 +0000 (02:01 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours am:
cb970f408e -s ours am:
fafa73a8ac am:
0639d05e55 am:
a701b1b6f6 -s ours
am:
afafdff50e
Change-Id: I33b393b32af485c4bb96d723a44e24d1acefaadc
Ajay Panicker [Wed, 21 Sep 2016 02:00:25 +0000 (02:00 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957
am:
cc4fd13113
Change-Id: I0b99176d0bc750dd824f0cd7b9663c87a6424143
Jaewan Kim [Mon, 19 Sep 2016 12:19:55 +0000 (21:19 +0900)]
DO NOT MERGE Check caller for sending media key to global priority session
Prevent sending media key events from the non-system app to the global
priority session through the MediaSessionManager.dispatchMediaKeyEvent().
Note that any app can use the API indirectly with
the public API AudioManager.dispatchMediaKeyEvent().
Bug:
29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
Jaewan Kim [Wed, 21 Sep 2016 01:07:24 +0000 (10:07 +0900)]
DO NOT MERGE Check caller for sending media key to global priority session
Prevent sending media key events from the non-system app to the global
priority session through the MediaSessionManager.dispatchMediaKeyEvent().
Note that any app can use the API indirectly with
the public API AudioManager.dispatchMediaKeyEvent().
Bug:
29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
Jaewan Kim [Mon, 19 Sep 2016 12:19:55 +0000 (21:19 +0900)]
DO NOT MERGE Check caller for sending media key to global priority session
Prevent sending media key events from the non-system app to the global
priority session through the MediaSessionManager.dispatchMediaKeyEvent().
Note that any app can use the API indirectly with
the public API AudioManager.dispatchMediaKeyEvent().
Bug:
29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
Jaewan Kim [Mon, 19 Sep 2016 12:19:55 +0000 (21:19 +0900)]
DO NOT MERGE Check caller for sending media key to global priority session
Prevent sending media key events from the non-system app to the global
priority session through the MediaSessionManager.dispatchMediaKeyEvent().
Note that any app can use the API indirectly with
the public API AudioManager.dispatchMediaKeyEvent().
Bug:
29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
Marie Janssen [Wed, 21 Sep 2016 01:34:29 +0000 (01:34 +0000)]
Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am:
22046e7323 am:
e4f60787f3 am:
ce8032ebbb am:
0ed17e5c8d
am:
9013d67f0c
Change-Id: I410c28139316f4b9bef378d73ad8e39f83ae21df
Marie Janssen [Wed, 21 Sep 2016 01:32:37 +0000 (01:32 +0000)]
Fix setPairingConfirmation permissions issue (2/2) am:
93326cfd9f am:
3106e3ae27 am:
e3812fc048 am:
532d2b11a3
am:
6f514cc82b
Change-Id: Idc9352afe667bb8be4846dc53036e95af2b248ce
Marie Janssen [Wed, 21 Sep 2016 01:04:28 +0000 (01:04 +0000)]
Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am:
22046e7323 am:
e4f60787f3 am:
ce8032ebbb
am:
0ed17e5c8d
Change-Id: Ie2b6d2008be82b8413ed01e1a51b88ea66ad9f48
Marie Janssen [Wed, 21 Sep 2016 01:02:29 +0000 (01:02 +0000)]
Fix setPairingConfirmation permissions issue (2/2) am:
93326cfd9f am:
3106e3ae27 am:
e3812fc048
am:
532d2b11a3
Change-Id: Iee468d3bcfd72b33475e9bf1d51865f3c5e8a4a2
Ajay Panicker [Wed, 21 Sep 2016 01:02:28 +0000 (01:02 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)
am:
bb9b38b957
Change-Id: I8083cdc24b838d235c83360372afc198c2f9f6c5
Ajay Panicker [Wed, 21 Sep 2016 01:00:49 +0000 (01:00 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b
am:
9a66565324 -s ours
Change-Id: I4b7cfdd5cad8ab054bb1e03279eb27a302c6acc2
TreeHugger Robot [Wed, 21 Sep 2016 00:52:46 +0000 (00:52 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev
Ajay Panicker [Wed, 21 Sep 2016 00:50:07 +0000 (00:50 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db am:
b367200be4
am:
ef74f3b079 -s ours
Change-Id: I0273945795e743e3508b9691c388b7fd3a32cdbc
Ajay Panicker [Wed, 21 Sep 2016 00:48:28 +0000 (00:48 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660 am:
3d995d6f5f -s ours am:
4f77ca16e4 -s ours am:
959b1aa5b9 am:
7caccc107f
am:
1dcec33349 -s ours
Change-Id: Ibc2d0fd88e89b0553cf5c9542457172692271318
OSDN Git Service
