OSDN Git Service
Jaewan Kim [Thu, 22 Sep 2016 08:08:16 +0000 (08:08 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am:
162c80bf0c am:
e47b5adce2 am:
bea0b3ec06 -s ours am:
91ccfa1def
am:
4167620d33
Change-Id: I1af888ef60ff3920e1b63a421e432319bdefdb3e
Jaewan Kim [Thu, 22 Sep 2016 08:07:15 +0000 (08:07 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
6a1567c267 am:
709d112eca am:
6bf115121c -s ours am:
30d1440861
am:
ba1d8300be
Change-Id: I198e4b87bed7f0b4e253e86a89fa5c36fec1fbb2
Ajay Panicker [Thu, 22 Sep 2016 04:58:44 +0000 (04: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 am:
94c08c2bed -s ours am:
d4fe288933
am:
f65661939b
Change-Id: I05d4bdc92834197058c77ae31113c9783b558d8e
Ajay Panicker [Thu, 22 Sep 2016 04:57:53 +0000 (04:57 +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 am:
1448a693d8
am:
3d4c737736
Change-Id: Ic23e1121dda4b85e5064c8d47a142da41617f321
Ajay Panicker [Thu, 22 Sep 2016 04:57:01 +0000 (04:57 +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 am:
a70fffe8e7
am:
d677e8d413
Change-Id: Ib333fdba81a5c339bc9b55fa3055a73a3b6042a7
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
Jaewan Kim [Thu, 22 Sep 2016 04:29:59 +0000 (04:29 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am:
162c80bf0c am:
e47b5adce2 am:
bea0b3ec06 -s ours
am:
91ccfa1def
Change-Id: I9f76004fe1ef3b54b187414281874f34e2ff4dc8
Jaewan Kim [Thu, 22 Sep 2016 04:29:01 +0000 (04:29 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
6a1567c267 am:
709d112eca am:
6bf115121c -s ours
am:
30d1440861
Change-Id: I000e899b41a1a88a2d68a3d554b3d2f6045aa0d2
Ajay Panicker [Thu, 22 Sep 2016 03:49:50 +0000 (03:49 +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
am:
d4fe288933
Change-Id: Ie0629a3b6f4c5fd8166bb060673606878f00bef8
Ajay Panicker [Thu, 22 Sep 2016 03:48:56 +0000 (03:48 +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
am:
1448a693d8
Change-Id: I8693bc42cd9ff46f6b0c56db49a5c467b3ab4af0
Jaewan Kim [Thu, 22 Sep 2016 03:48:37 +0000 (03:48 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am:
162c80bf0c am:
e47b5adce2
am:
bea0b3ec06 -s ours
Change-Id: Ic367544242a4034b66f03568eb7d1035f90836dd
Ajay Panicker [Thu, 22 Sep 2016 03:47:58 +0000 (03:47 +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
am:
a70fffe8e7
Change-Id: Id42caaa08c4e933cf0d08bfe7c8271f2cdd40c76
Jaewan Kim [Thu, 22 Sep 2016 03:47:42 +0000 (03:47 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
6a1567c267 am:
709d112eca
am:
6bf115121c -s ours
Change-Id: Ic25670f851a72e8be2b028016ac4515c8977d349
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
Jaewan Kim [Thu, 22 Sep 2016 03:23:14 +0000 (03:23 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am:
162c80bf0c
am:
e47b5adce2
Change-Id: Ie35fa2ebffc5f5369b1473f78c0bfeb38fdfc5ca
Jaewan Kim [Thu, 22 Sep 2016 03:22:18 +0000 (03:22 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
6a1567c267
am:
709d112eca
Change-Id: Ic112856078e6b3c0bd4e6e2442457c3be035a253
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
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: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: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
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: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:51 +0000 (21:46 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-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: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 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: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: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: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
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
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
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
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
Ajay Panicker [Wed, 21 Sep 2016 00:21:20 +0000 (00:21 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours
am:
050b9170db
Change-Id: If64625b574530db5f9d3ce01871fb8ea38ad9ca3
Ajay Panicker [Wed, 21 Sep 2016 00:20:21 +0000 (00:20 +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
Change-Id: I8a13167984a898e726953d6a80694786d120015b
Marie Janssen [Wed, 21 Sep 2016 00:19:16 +0000 (00:19 +0000)]
Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev
am:
22046e7323
Change-Id: I06e960bef8fc2fdacfe9f6e4ecb1e970eb1e7cb4
Marie Janssen [Wed, 21 Sep 2016 00:19:12 +0000 (00:19 +0000)]
Fix setPairingConfirmation permissions issue (2/2)
am:
93326cfd9f
Change-Id: If8fdb8c3f5c167e1b6465c67cf64b8310d55b80b
Ajay Panicker [Wed, 21 Sep 2016 00:19:02 +0000 (00:19 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours am:
cb970f408e -s ours
am:
fafa73a8ac
Change-Id: Icecb73a1309bb45994889756f8e421dc6fda76a4
Ajay Panicker [Wed, 21 Sep 2016 00:17:48 +0000 (00:17 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev
am:
19b09dd0d3 -s ours
Change-Id: Id030cd83f6759c255c1a5cfbea8b90a92610a02d
Ajay Panicker [Wed, 21 Sep 2016 00:13:03 +0000 (00:13 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)
am:
0ea21bc70e -s ours
Change-Id: I24d8a2df435e4df43cc39d0e0314796e53e30429
Ajay Panicker [Wed, 21 Sep 2016 00:12:20 +0000 (00:12 +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
Change-Id: I6be29367b410ffc98e61d49450bb1d9905fbf3f8
TreeHugger Robot [Wed, 21 Sep 2016 00:12:03 +0000 (00:12 +0000)]
Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev
Ajay Panicker [Wed, 21 Sep 2016 00:10:52 +0000 (00:10 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours
am:
cb970f408e -s ours
Change-Id: I385bc1700aebf53fb2846a149995925dcb00b5e8
TreeHugger Robot [Wed, 21 Sep 2016 00:07:34 +0000 (00:07 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev
Ajay Panicker [Wed, 21 Sep 2016 00:04:35 +0000 (00:04 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660
am:
3d995d6f5f -s ours
Change-Id: I9e410ce2d5302eda87aea9628cb58ca203a212c5
Ajay Panicker [Wed, 21 Sep 2016 00:03:23 +0000 (00:03 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5
am:
3758253ae8 -s ours
Change-Id: I0836ddb1649084a6814c461bccc41135cb475337
Ajay Panicker [Tue, 20 Sep 2016 23:56:48 +0000 (23:56 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e
am:
a278a1e660
Change-Id: I22838d21bdd289ca34b78260ade59adafbdc408a
Ajay Panicker [Tue, 20 Sep 2016 23:55:44 +0000 (23:55 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a
am:
271e34dbd5
Change-Id: I954b8f2d9333fa6bb549dc812733d2b8f71220b9
Ajay Panicker [Tue, 20 Sep 2016 23:49:13 +0000 (23:49 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev
am:
204da8aa9e
Change-Id: I0ff3b20fc2f3318070e343dfe6dc29b2979284ef
Ajay Panicker [Tue, 20 Sep 2016 23:49:05 +0000 (23:49 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)
am:
edae39d59a
Change-Id: I2bdf5c6fc24fd370e2555585e8492558040c0d10
Ajay Panicker [Thu, 8 Sep 2016 18:01:29 +0000 (11:01 -0700)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)
setPairingConfirmation was set to only require BLUETOOTH_ADMIN
permission which shouldn't be able to set the confirmation itself.
This is restricted to BLUETOOTH_PRIVILEGED permission.
Bug:
29043989
Change-Id: Iddc935f0b02f5ff56e930914b4b664377e786184
TreeHugger Robot [Tue, 20 Sep 2016 23:44:57 +0000 (23:44 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev
Sudheer Shanka [Tue, 20 Sep 2016 05:54:37 +0000 (05:54 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am:
d1e3e53d79 am:
a4c9bbefdf am:
3fca892d3e -s ours am:
1d053b3be8 -s ours am:
af97c8805f am:
8074c533df am:
2f0228c153 -s ours am:
29e4cd66d7
am:
7fd31ca09c
Change-Id: I36eecf20e2fc862daba195738363761b27e9fe8f
Sudheer Shanka [Tue, 20 Sep 2016 05:51:05 +0000 (05:51 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
dce4be63bb am:
a437e7f3f1 am:
c1b2e6db98 -s ours am:
ff9a8d74c7 -s ours am:
51bcb058ad am:
c6d9bdded2 am:
1b0debac62 -s ours am:
1310d53aea
am:
71bb55afd9
Change-Id: Id9ccdcb6bad4eddb355f2035049361c66a3a5f15
Sudheer Shanka [Tue, 20 Sep 2016 05:34:00 +0000 (05:34 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am:
b358ee3558 -s ours am:
43a1f74d7f am:
e8e30122e8 am:
fcc3d8fca2 -s ours am:
b235bc6f09
am:
8fedc773fc
Change-Id: I389e25a4d5bc24761cc7c2c9e94e45e5e6158453
Sudheer Shanka [Tue, 20 Sep 2016 05:23:59 +0000 (05:23 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am:
d1e3e53d79 am:
a4c9bbefdf am:
3fca892d3e -s ours am:
1d053b3be8 -s ours am:
af97c8805f am:
8074c533df am:
2f0228c153 -s ours
am:
29e4cd66d7
Change-Id: Ib64a0085bfdb4a8e0a4d8d4b69b7434a0f8fdd4e
Sudheer Shanka [Tue, 20 Sep 2016 05:14:33 +0000 (05:14 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
dce4be63bb am:
a437e7f3f1 am:
c1b2e6db98 -s ours am:
ff9a8d74c7 -s ours am:
51bcb058ad am:
c6d9bdded2 am:
1b0debac62 -s ours
am:
1310d53aea
Change-Id: If01f2017d66da002d7e01fb28ffd49f0e84319d1
Sudheer Shanka [Tue, 20 Sep 2016 05:06:22 +0000 (05:06 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am:
b358ee3558 -s ours am:
43a1f74d7f am:
e8e30122e8 am:
fcc3d8fca2 -s ours
am:
b235bc6f09
Change-Id: Id2d98d2f695f8884b5854e8fb1fbf406fda8fdb0
Sudheer Shanka [Tue, 20 Sep 2016 03:19:49 +0000 (03:19 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am:
d1e3e53d79 am:
a4c9bbefdf am:
3fca892d3e -s ours am:
1d053b3be8 -s ours am:
af97c8805f am:
8074c533df
am:
2f0228c153 -s ours
Change-Id: Icd41b479bb5b365173e146791c1ee858f2265128
Sudheer Shanka [Tue, 20 Sep 2016 02:42:00 +0000 (02:42 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
dce4be63bb am:
a437e7f3f1 am:
c1b2e6db98 -s ours am:
ff9a8d74c7 -s ours am:
51bcb058ad am:
c6d9bdded2
am:
1b0debac62 -s ours
Change-Id: I60e0ac94a2f1147ce80419d429a9d4681e3a0c57
Sudheer Shanka [Tue, 20 Sep 2016 02:21:52 +0000 (02:21 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am:
d1e3e53d79 am:
a4c9bbefdf am:
3fca892d3e -s ours am:
1d053b3be8 -s ours am:
af97c8805f
am:
8074c533df
Change-Id: I58b7a1746647513f96f5dded0f9645dd86256e2f
OSDN Git Service
