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

161223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dfedca4e43 DO NOT MERGE Fix build 
Bug: 29833954
Change-Id: Ia814969b516ac7cc0ad7431ebab40cc74fdf2a05
 2016-09-22 17:43:35 +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
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
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
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
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
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
5abd69e59a Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev 
am: 64b7b1522e  -s ours

Change-Id: I1aaad42b1a3a82753aca4d55d743116cc3b674bd
 2016-09-21 22:53:42 +00:00
Jaewan Kim
031fb04776 DO NOT MERGE Check caller for sending media key to global priority session 
am: 4e9af38ec4  -s ours

Change-Id: I416843909b0b49378d8b6dc4eb92032ae7a1418e
 2016-09-21 22:53:38 +00:00
Jaewan Kim
64b7b1522e Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev 2016-09-21 22:21:06 +00:00
Ajay Panicker
dc0f9fa9c9 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 
am: 35d1b45b0f

Change-Id: I0417ea58275604b9ac1fca6e79c14697d965397a
 2016-09-21 21:56:49 +00:00
Ajay Panicker
438cc52ca1 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 
am: 8fd324c33f

Change-Id: Idbe61150d738e5e41d5606fa6d89c0a5b604a86d
 2016-09-21 21:55:46 +00:00
TreeHugger Robot
162c80bf0c Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev 2016-09-21 21:46:53 +00:00
Ajay Panicker
35d1b45b0f Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev 
am: c119a677c4

Change-Id: I7f1a7c5d09d38cfbd3fca0ee158f6401233e8f6d
 2016-09-21 21:15:59 +00:00
Ajay Panicker
8fd324c33f [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed 
am: 786e2694b1

Change-Id: Ia40c3fc57b5c17910c67faf40b940bdd944dd4e3
 2016-09-21 21:15:56 +00:00
Ajay Panicker
7cd1668893 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev 
am: f78ff48d0d  -s ours

Change-Id: I82e447c8dbbabd40977805bc1d233de832296e6b
 2016-09-21 21:15:40 +00:00
Ajay Panicker
57fdbb97a6 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed 
am: 27b3d578b9  -s ours

Change-Id: Ia29f66f121813b3e03a16a665f7bdae2d75ed09b
 2016-09-21 21:15:37 +00:00
Ajay Panicker
447ac4b31d Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev 2016-09-21 21:08:10 +00:00
Ajay Panicker
f78ff48d0d Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev 2016-09-21 21:08:07 +00:00
Ajay Panicker
c119a677c4 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev 2016-09-21 21:08:04 +00:00
Jaewan Kim
4e9af38ec4 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
 2016-09-21 10:44:09 +09:00
Jaewan Kim
6a1567c267 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
 2016-09-21 10:42:53 +09:00
TreeHugger Robot
60bf672485 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev 2016-09-21 00:52:50 +00:00
Ajay Panicker
5977c8b5bc Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev 
am: 19b09dd0d3  -s ours

Change-Id: Id030cd83f6759c255c1a5cfbea8b90a92610a02d
 2016-09-21 00:17:48 +00:00
Ajay Panicker
050b9170db [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) 
am: 0ea21bc70e  -s ours

Change-Id: I24d8a2df435e4df43cc39d0e0314796e53e30429
 2016-09-21 00:13:03 +00:00
Ajay Panicker
959b1aa5b9 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
 2016-09-21 00:12:20 +00:00
Ajay Panicker
fafa73a8ac [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours 
am: cb970f408e  -s ours

Change-Id: I385bc1700aebf53fb2846a149995925dcb00b5e8
 2016-09-21 00:10:52 +00:00
TreeHugger Robot
19b09dd0d3 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev 2016-09-21 00:07:38 +00:00
Ajay Panicker
4f77ca16e4 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 
am: 3d995d6f5f  -s ours

Change-Id: I9e410ce2d5302eda87aea9628cb58ca203a212c5
 2016-09-21 00:04:35 +00:00
Ajay Panicker
cb970f408e [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 
am: 3758253ae8  -s ours

Change-Id: I0836ddb1649084a6814c461bccc41135cb475337
 2016-09-21 00:03:23 +00:00
Ajay Panicker
3d995d6f5f Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e 
am: a278a1e660

Change-Id: I22838d21bdd289ca34b78260ade59adafbdc408a
 2016-09-20 23:56:48 +00:00
Ajay Panicker
3758253ae8 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a 
am: 271e34dbd5

Change-Id: I954b8f2d9333fa6bb549dc812733d2b8f71220b9
 2016-09-20 23:55:44 +00:00
Ajay Panicker
a278a1e660 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev 
am: 204da8aa9e

Change-Id: I0ff3b20fc2f3318070e343dfe6dc29b2979284ef
 2016-09-20 23:49:13 +00:00
Ajay Panicker
271e34dbd5 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) 
am: edae39d59a

Change-Id: I2bdf5c6fc24fd370e2555585e8492558040c0d10
 2016-09-20 23:49:05 +00:00
Ajay Panicker
bb9b38b957 [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
 2016-09-20 23:47:09 +00:00
TreeHugger Robot
204da8aa9e Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev 2016-09-20 23:45:00 +00:00
Sudheer Shanka
af97c8805f Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours 
am: 1d053b3be8  -s ours

Change-Id: I359bae35d6698349370b4f9a51427f10eb2bbdf3
 2016-09-20 00:12:50 +00:00
Sudheer Shanka
1d053b3be8 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf 
am: 3fca892d3e  -s ours

Change-Id: I4d66089c6ec8743f119dd4aab641b22ebdad7b5c
 2016-09-19 23:24:48 +00:00
Sudheer Shanka
51bcb058ad DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours 
am: ff9a8d74c7  -s ours

Change-Id: I14d6109858bcf02b5f55eb3e207d6bc1918e746a
 2016-09-19 23:02:54 +00:00
Sudheer Shanka
ff9a8d74c7 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 
am: c1b2e6db98  -s ours

Change-Id: I006233ce7258467da7d5c09c9925bd6048d85ed3
 2016-09-19 21:50:49 +00:00
Sudheer Shanka
3fca892d3e Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 
am: a4c9bbefdf

Change-Id: I224c2cf56d53acf091a11372f82d1305052c6f18
 2016-09-19 21:50:47 +00:00