drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,385 Commits 1 Branch 0 Tags
Commit Graph

199385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaewan Kim
2cd4383c31 Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 
am: 585f642d65  -s ours

Change-Id: Ibbc592cb5fc2b035b87cbb89dcf5dee085c63e14
 2016-09-22 21:56:51 +00:00
Jaewan Kim
e9a9e2f055 DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 
am: ed3e26e2be  -s ours

Change-Id: Ie4fd67251243bba5f6c39320b752cd1cb9f8987e
 2016-09-22 21:55:51 +00:00
Jaewan Kim
585f642d65 Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 
am: 462493ee81

Change-Id: I822c5aeb87aea023aa8dba38a4beb6de98225f4a
 2016-09-22 20:34:22 +00:00
Jaewan Kim
ed3e26e2be DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 
am: 3ea1f124f9

Change-Id: I6762900887ed8ec6afb5b787fc3a2426b846a6c1
 2016-09-22 20:33:24 +00:00
Jaewan Kim
462493ee81 Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours 
am: ded4df2e79

Change-Id: I16dd5912ae18ae4f25bdd9a8e2fa7d07ca8f1b61
 2016-09-22 20:05:49 +00:00
Jaewan Kim
3ea1f124f9 DO NOT MERGE Fix build am: dfedca4e43 -s ours 
am: 499871ebe9

Change-Id: I7999092c3ba1df344f305b3e5d2befa65d1ad04a
 2016-09-22 20:03:57 +00:00
Jaewan Kim
ded4df2e79 Merge "DO NOT MERGE Fix build" into lmp-dev 
am: fce3b76452  -s ours

Change-Id: Iea1a397f79856070d5f801193c71721a8ff69936
 2016-09-22 18:09:45 +00:00
Jaewan Kim
499871ebe9 DO NOT MERGE Fix build 
am: dfedca4e43  -s ours

Change-Id: Ibf95b4c061129b2cd047e3b8a8da9f90cfea7e8f
 2016-09-22 18:09:41 +00:00
Jaewan Kim
fce3b76452 Merge "DO NOT MERGE Fix build" into lmp-dev 2016-09-22 17:46:59 +00:00
Jaewan Kim
dfedca4e43 DO NOT MERGE Fix build 
Bug: 29833954
Change-Id: Ia814969b516ac7cc0ad7431ebab40cc74fdf2a05
 2016-09-22 17:43:35 +00:00
Jaewan Kim
1c278e5652 Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours am: 890f53a486 am: 1bf809c490 
am: 6ad7c0f6ce  -s ours

Change-Id: I71157581308c3ef4be7dad8db5c7d9a637a24320
 2016-09-22 13:58:30 +00:00
Jaewan Kim
fa9983ec73 DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea am: 7eaeeb49bb 
am: 7ffaaca237  -s ours

Change-Id: I1db1ad50bfd89c038f9d226109958011aeb1496e
 2016-09-22 13:31:57 +00:00
Jaewan Kim
6ad7c0f6ce Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours am: 890f53a486 
am: 1bf809c490

Change-Id: I0a316929c7654f89e435ac459bc9175434136f99
 2016-09-22 13:10:13 +00:00
Jaewan Kim
1bf809c490 Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours 
am: 890f53a486

Change-Id: I7f85d8785ce8829cb9d01a23413c545f5e5a769a
 2016-09-22 12:29:19 +00:00
Ajay Panicker
0029d03c0a Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9 -s ours am: 8919cc83bb -s ours am: 0241b6d88a am: 0fee65e58b 
am: 08fed21f2c  -s ours

Change-Id: I2e790e95077c0760d1be6d984e7e90fb62a3d9db
 2016-09-22 12:28:51 +00:00
Jaewan Kim
7ffaaca237 DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea 
am: 7eaeeb49bb

Change-Id: I21b359b1471ee527a2bc975c399253def98e40fe
 2016-09-22 11:21:01 +00:00
Ajay Panicker
08fed21f2c Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9 -s ours am: 8919cc83bb -s ours am: 0241b6d88a 
am: 0fee65e58b

Change-Id: I6e5bb9fea57cf5fe9cff68952d6b2878ce005d7c
 2016-09-22 09:53:30 +00:00
Jaewan Kim
890f53a486 Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours 
am: 5ac79fa0a1  -s ours

Change-Id: I02b22b773537b4c37893114f85714c32de5035a2
 2016-09-22 09:38:16 +00:00
Ajay Panicker
bc12dda3a7 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1 -s ours am: 7f84596929 -s ours am: ed82c6fac8 am: c1f8a09c1e 
am: 8091a00994  -s ours

Change-Id: I51723f883566989133b0c8be92108b8c910c0981
 2016-09-22 09:38:13 +00:00
Jaewan Kim
7eaeeb49bb DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours 
am: f140f796ea

Change-Id: I8db6ebc6704a60d44739e873038403c2740304e3
 2016-09-22 09:35:44 +00:00
Jaewan Kim
5ac79fa0a1 Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 
am: 84ecab6059  -s ours

Change-Id: I077206cbba5614e52046cbbbf6e40544c3e25f92
 2016-09-22 09:13:35 +00:00
Jaewan Kim
f140f796ea DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours 
am: 8dffbcd169  -s ours

Change-Id: Ida4217e4a0392c2f58b1ef3d0229bad4229c838d
 2016-09-22 09:13:22 +00:00
Jaewan Kim
8dffbcd169 DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c 
am: 27d24e01cb  -s ours

Change-Id: Ibfec9c02db97a94476d1b6b4d7e98fd051d4aa58
 2016-09-22 08:07:29 +00:00
Jaewan Kim
84ecab6059 Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 
am: b38fbf9894

Change-Id: I6f6d600544f09aac349a626e3ced18de5e02a2eb
 2016-09-22 08:07:17 +00:00
Ajay Panicker
8091a00994 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1 -s ours am: 7f84596929 -s ours am: ed82c6fac8 
am: c1f8a09c1e

Change-Id: I846d53b9f2b8ac6215d873d2dc8ae3efa20c5919
 2016-09-22 08:06:50 +00:00
Jaewan Kim
298c104ae5 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a am: f7f452fd28 
am: 8a168a7c5d  -s ours

Change-Id: Ib4a702bd653ca1083ac4846ac4a6947ef91e2e33
 2016-09-22 08:06:16 +00:00
Jaewan Kim
8d14f464b5 DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776 am: 2d88f87a82 
am: 64110c6bf1  -s ours

Change-Id: I69062cb6535df22a743270a62fda89dcca155e87
 2016-09-22 08:05:11 +00:00
Ajay Panicker
0fee65e58b Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9 -s ours am: 8919cc83bb -s ours 
am: 0241b6d88a

Change-Id: Ie34765f501d780285449d792c3ebee31090a2651
 2016-09-22 08:03:19 +00:00
Jaewan Kim
27d24e01cb DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 
am: 9477c1674c

Change-Id: If2edd8d386cd57f00221fedff3f118e6887cab61
 2016-09-22 07:35:37 +00:00
Jaewan Kim
8a168a7c5d Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a 
am: f7f452fd28

Change-Id: Iaceb27058be8f06e2e1b0a115ba914f7b0aad7e4
 2016-09-22 06:41:03 +00:00
Ajay Panicker
0241b6d88a Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9 -s ours 
am: 8919cc83bb  -s ours

Change-Id: I3370b5bb190ab5c7749e729fefdec33f06523899
 2016-09-22 06:41:02 +00:00
Jaewan Kim
64110c6bf1 DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776 
am: 2d88f87a82

Change-Id: Idd9cdf4bb14b4feced73ea176f3505ae02d630e7
 2016-09-22 06:40:05 +00:00
Jaewan Kim
b38fbf9894 Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev 
am: 5b05226586

Change-Id: I0b0b672c42a7a4bd75ccbeb2c3a1047eebda5076
 2016-09-22 06:39:33 +00:00
Jaewan Kim
9477c1674c DO NOT MERGE Check caller for sending media key to telephony service 
am: d1641e8c27

Change-Id: I5be1d931c3a2f2748e69158d442172c327199ef5
 2016-09-22 06:39:24 +00:00
Ajay Panicker
c1f8a09c1e [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1 -s ours am: 7f84596929 -s ours 
am: ed82c6fac8

Change-Id: Idd9dd9b69ae2d5d176c0b9ff663661985658230e
 2016-09-22 06:10:41 +00:00
Jaewan Kim
5b05226586 Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev 2016-09-22 05:19:37 +00:00
Ajay Panicker
ed82c6fac8 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1 -s ours 
am: 7f84596929  -s ours

Change-Id: Ia1485d87e224d8fb870b50bc73f4ee6e93dd48e4
 2016-09-22 04:54:32 +00:00
Jaewan Kim
d1641e8c27 DO NOT MERGE Check caller for sending media key to telephony service 
Prevent sending media key events from the non-system app to the
telephony service through the AudioManager.dispatchMediaKeyEvent()
or sending media key broadcast directly.

Bug: 29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
 2016-09-22 12:53:08 +09:00
Ajay Panicker
8919cc83bb Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f 
am: dc0f9fa9c9  -s ours

Change-Id: I75e0e5a61d15b2e6c4a1fec70b807165c8768987
 2016-09-22 03:50:02 +00:00
Ajay Panicker
7f84596929 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f 
am: 438cc52ca1  -s ours

Change-Id: Iabaa5642ffa6c3417b5e027e2da9b33666b1aacf
 2016-09-22 03:48:40 +00:00
Jaewan Kim
91ccfa1def 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
 2016-09-22 03:48:37 +00:00
Jaewan Kim
30d1440861 DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca 
am: 6bf115121c  -s ours

Change-Id: Ic25670f851a72e8be2b028016ac4515c8977d349
 2016-09-22 03:47:42 +00:00
Jaewan Kim
bea0b3ec06 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
 2016-09-22 03:23:14 +00:00
Jaewan Kim
6bf115121c DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 
am: 709d112eca

Change-Id: Ic112856078e6b3c0bd4e6e2442457c3be035a253
 2016-09-22 03:22:18 +00:00
Jaewan Kim
f7f452fd28 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
 2016-09-22 02:55:15 +00:00
Jaewan Kim
2d88f87a82 DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours 
am: 031fb04776

Change-Id: I05beb9fff4527be83812122be9d783c9a109cb01
 2016-09-22 02:54:22 +00:00
Ajay Panicker
d4fe288933 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
 2016-09-22 01:37:37 +00:00
Ajay Panicker
1448a693d8 [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
 2016-09-22 01:36:41 +00:00
Ajay Panicker
a70fffe8e7 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
 2016-09-22 01:35:54 +00:00
Ajay Panicker
c56c079470 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1 
am: 8be4dc7e16  -s ours

Change-Id: Ic7a46031556a3ae24d8f56808c0b9c631cf931a4
 2016-09-22 01:34:51 +00:00