OSDN Git Service
Ajay Panicker [Thu, 22 Sep 2016 14:24:38 +0000 (14:24 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470 am:
1783182332 am:
993015ce9a am:
8e172c638d -s ours
am:
9338ffa148
Change-Id: I92ec98b22ea071df0a24d19f8a6bb4523606089d
Jaewan Kim [Thu, 22 Sep 2016 13:57:14 +0000 (13:57 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13 am:
78fa55e261 am:
b2403f3102 am:
5decf8e715 -s ours
am:
963c269ffa
Change-Id: Ife5fa9fb43fb28eb8e71a7707c846c58d18478b4
Ajay Panicker [Thu, 22 Sep 2016 10:53:39 +0000 (10:53 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470 am:
1783182332 am:
993015ce9a
am:
8e172c638d -s ours
Change-Id: I6ed9ac6f79a853f08fbc3105cade0d47033701f0
Jaewan Kim [Thu, 22 Sep 2016 10:52:37 +0000 (10:52 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13 am:
78fa55e261 am:
b2403f3102
am:
5decf8e715 -s ours
Change-Id: I79036440c10f32b4a30fbefa3a3ff65ebd9fc69e
Jaewan Kim [Thu, 22 Sep 2016 10:50:05 +0000 (10:50 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
c282c4f106 am:
868d586c98 am:
ff1c1993b7 am:
35e95d82d7 -s ours
am:
2ccdbce954
Change-Id: Iede8b78ecc2ae054266286d69317b655263deacc
TreeHugger Robot [Thu, 22 Sep 2016 09:53:00 +0000 (09:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
Jaewan Kim [Thu, 22 Sep 2016 08:07:35 +0000 (08:07 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
c282c4f106 am:
868d586c98 am:
ff1c1993b7
am:
35e95d82d7 -s ours
Change-Id: I5fe98000c623199706bd3879a361ef72e0da2ccb
Ajay Panicker [Thu, 22 Sep 2016 07:36:50 +0000 (07:36 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470 am:
1783182332
am:
993015ce9a
Change-Id: I19514d41db780f41114fe05e86360beeda44352b
Jaewan Kim [Thu, 22 Sep 2016 07:35:45 +0000 (07:35 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13 am:
78fa55e261
am:
b2403f3102
Change-Id: Ia418a5eb08b7f5cdb2a987c4f17708069012c0e5
Jaewan Kim [Thu, 22 Sep 2016 07:34:55 +0000 (07:34 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
c282c4f106 am:
868d586c98
am:
ff1c1993b7
Change-Id: I60355987ea0814314c2f79041d068e099b158c7b
Bill Yi [Thu, 22 Sep 2016 05:59:39 +0000 (22:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ebb252040d261a9ce7dc01d080b9cc82c644533
Auto-generated-cl: translation import
Ajay Panicker [Thu, 22 Sep 2016 04:56:04 +0000 (04:56 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470
am:
1783182332
Change-Id: Ia62f75205e5d8406249991175fc5cf66d1f2bdb9
Jaewan Kim [Thu, 22 Sep 2016 04:55:18 +0000 (04:55 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13
am:
78fa55e261
Change-Id: I81587010e753fd1f23a530c973675fe0790b8b33
Jaewan Kim [Thu, 22 Sep 2016 04:54:25 +0000 (04:54 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
c282c4f106
am:
868d586c98
Change-Id: Icc7c4e12e75f5b27c41866fcb8d8553fcffd90ab
Elliot Waite [Thu, 22 Sep 2016 03:49:12 +0000 (03:49 +0000)]
Merge "Revert fixed at links." into nyc-dev
am:
c77b72f244
Change-Id: I2ee03bed08613ad562cd62fdae1c1bc526c10be4
Elliot Waite [Thu, 22 Sep 2016 03:49:08 +0000 (03:49 +0000)]
Revert fixed at links.
am:
7c70fed347
Change-Id: I69a15936193917911224af7f417b16d30dd8dfe4
Adarsh Fernando [Thu, 22 Sep 2016 03:48:21 +0000 (03:48 +0000)]
Found a couple of more references to Android N.
am:
9af57aa309
Change-Id: I2a72b761fdb8fddbda7aca792a08c851595b29ac
Adarsh Fernando [Thu, 22 Sep 2016 03:47:02 +0000 (03:47 +0000)]
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev
am:
fe060d3f37
Change-Id: I4c7c2363cea058a1b905b07826ffba5a4439f833
Ajay Panicker [Thu, 22 Sep 2016 03:47:01 +0000 (03:47 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours
am:
c56c079470
Change-Id: Ie03995ef39bce15b5279ff78ef23e94401eab9db
Adarsh Fernando [Thu, 22 Sep 2016 03:46:55 +0000 (03:46 +0000)]
Docs: Cleanup of Preview language in Android 7.0 docs.
am:
4b6d939321
Change-Id: Ife2fba8fa61083ccaf2c3f4a3df88418bd0a316b
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: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
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
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
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: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
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: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:15:32 +0000 (21:15 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
am:
85bc33a8f4
Change-Id: I2194d4c01e8bff53a7d6fcdf25513b216a511155
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 [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
Marie Janssen [Wed, 21 Sep 2016 00:47:29 +0000 (00:47 +0000)]
Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am:
22046e7323 am:
e4f60787f3
am:
ce8032ebbb
Change-Id: I2e48e99c2e0cd3f1990cb17a4fc672fe312576bd
Ajay Panicker [Wed, 21 Sep 2016 00:47:16 +0000 (00:47 +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
Change-Id: Ie8be52ca401883516b0e746ee9211c4a44460e1c
Marie Janssen [Wed, 21 Sep 2016 00:46:01 +0000 (00:46 +0000)]
Fix setPairingConfirmation permissions issue (2/2) am:
93326cfd9f am:
3106e3ae27
am:
e3812fc048
Change-Id: I6119aa9db2792a149202c16d63de205ba32423e8
Ajay Panicker [Wed, 21 Sep 2016 00:44:57 +0000 (00:44 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc
am:
cdff42091b
Change-Id: Ib97d5a470acde585ea27a1a3d0050871f644428e
Ajay Panicker [Wed, 21 Sep 2016 00:40:01 +0000 (00:40 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db
am:
b367200be4
Change-Id: I3e9a492bbdecc5335047c1687d2a7a6e8c33025f
Ajay Panicker [Wed, 21 Sep 2016 00:39:03 +0000 (00:39 +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
Change-Id: I8587341bb8ec9e42103e4082dfa249e56b773bbb
Marie Janssen [Wed, 21 Sep 2016 00:38:59 +0000 (00:38 +0000)]
Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am:
22046e7323
am:
e4f60787f3
Change-Id: I598f7cbaa4ff2bddaeb1e08e5eaa062c28ab7c60
Ajay Panicker [Wed, 21 Sep 2016 00:37:11 +0000 (00: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
Change-Id: Ic57c43dcd18e09ad860407c16a77662bdd68268b
Marie Janssen [Wed, 21 Sep 2016 00:37:07 +0000 (00:37 +0000)]
Fix setPairingConfirmation permissions issue (2/2) am:
93326cfd9f
am:
3106e3ae27
Change-Id: I0748eed7b884294d993b4538e4e65397b6f0dbb2
Ajay Panicker [Wed, 21 Sep 2016 00:36:25 +0000 (00:36 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours
am:
5977c8b5bc
Change-Id: Ia362dd16d6a58e6c9c617fec169ed86b8eea8e50