OSDN Git Service
Christopher Tate [Sat, 15 Oct 2016 00:33:36 +0000 (00:33 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders
am:
190e66685f
Change-Id: I0ed530e9909811e592f966a44f41400a0146c5b6
Christopher Tate [Tue, 16 Aug 2016 23:03:44 +0000 (16:03 -0700)]
DO NOT MERGE Isolated processes don't get precached system service binders
More specifically, they get a PackageManager binder -- necessary for
Android process startup and configuration -- but none of the other
usual preloaded service binders.
Bug
30202228
Change-Id: I3810649f504cd631665ece338a83d2e54d41ad05
(cherry picked from commit
2c61c57ac53cbb270b4e76b9d04465f8a3f6eadc)
Sungsoo [Thu, 13 Oct 2016 22:18:36 +0000 (22:18 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours am:
2a762996cb -s ours
am:
a8d06257c1
Change-Id: I5f25f766a472bfddc32aa7ab7e506bc5e5d6854b
Sungsoo [Thu, 13 Oct 2016 22:12:03 +0000 (22:12 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours
am:
2a762996cb -s ours
Change-Id: If32418debc774a2f78eae4cc2b3f5b77457bfa1c
Sungsoo [Thu, 13 Oct 2016 22:06:03 +0000 (22:06 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd
am:
68aa33b9bf -s ours
Change-Id: I7fe3d5dbcb7bd206233ce969840f5ed182913dd6
Sungsoo [Thu, 13 Oct 2016 22:01:39 +0000 (22:01 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f
am:
29e643bcbd
Change-Id: I413ba35abfc8999c405df78a40b8182f19472b6a
Sungsoo [Thu, 13 Oct 2016 22:00:51 +0000 (22:00 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
22bd36448e -s ours
am:
3992742559
Change-Id: I0b7cbc29fa69ff1170e377bd51621c5a5e14f793
Sungsoo [Thu, 13 Oct 2016 21:57:01 +0000 (21:57 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
am:
22bd36448e -s ours
Change-Id: I13a49444b80cd07c0cb37f6b8fb514b5b04e61bb
Sungsoo [Thu, 13 Oct 2016 21:56:56 +0000 (21:56 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
am:
c11f599a2f
Change-Id: If503e3361e69ad88a166f145603273d728d65652
Sungsoo [Thu, 13 Oct 2016 21:54:25 +0000 (21:54 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
am:
87a9ac70c3
Change-Id: I6639c6763ee1f7d83d03cc6d5fa11cbf1516e7cc
Sungsoo [Thu, 13 Oct 2016 03:24:16 +0000 (12:24 +0900)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.
Bug:
30936376, Bug:
32068647, Bug:
31319086
Change-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca
Sungsoo [Thu, 13 Oct 2016 03:24:16 +0000 (12:24 +0900)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.
Bug:
30936376, Bug:
32068647, Bug:
31319086
Change-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca
Sungsoo [Thu, 13 Oct 2016 03:24:16 +0000 (12:24 +0900)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.
Bug:
30936376, Bug:
32068647, Bug:
31319086
Change-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca
Jaewan Kim [Thu, 22 Sep 2016 20:05:49 +0000 (20:05 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours
am:
ded4df2e79
Change-Id: I16dd5912ae18ae4f25bdd9a8e2fa7d07ca8f1b61
Jaewan Kim [Thu, 22 Sep 2016 20:03:57 +0000 (20:03 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours
am:
499871ebe9
Change-Id: I7999092c3ba1df344f305b3e5d2befa65d1ad04a
Jaewan Kim [Thu, 22 Sep 2016 18:09:45 +0000 (18:09 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev
am:
fce3b76452 -s ours
Change-Id: Iea1a397f79856070d5f801193c71721a8ff69936
Jaewan Kim [Thu, 22 Sep 2016 18:09:41 +0000 (18:09 +0000)]
DO NOT MERGE Fix build
am:
dfedca4e43 -s ours
Change-Id: Ibf95b4c061129b2cd047e3b8a8da9f90cfea7e8f
Jaewan Kim [Thu, 22 Sep 2016 17:46:56 +0000 (17:46 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev
Jaewan Kim [Thu, 22 Sep 2016 05:56:33 +0000 (14:56 +0900)]
DO NOT MERGE Fix build
Bug:
29833954
Change-Id: Ia814969b516ac7cc0ad7431ebab40cc74fdf2a05
Jaewan Kim [Thu, 22 Sep 2016 12:29:19 +0000 (12:29 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 09:38:16 +0000 (09:38 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 09:35:44 +0000 (09:35 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 09:13:35 +0000 (09:13 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 09:13:22 +0000 (09:13 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 08:07:29 +0000 (08:07 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c
am:
27d24e01cb -s ours
Change-Id: Ibfec9c02db97a94476d1b6b4d7e98fd051d4aa58
Jaewan Kim [Thu, 22 Sep 2016 08:07:17 +0000 (08:07 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586
am:
b38fbf9894
Change-Id: I6f6d600544f09aac349a626e3ced18de5e02a2eb
Ajay Panicker [Thu, 22 Sep 2016 08:03:19 +0000 (08:03 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 07:35:37 +0000 (07:35 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27
am:
9477c1674c
Change-Id: If2edd8d386cd57f00221fedff3f118e6887cab61
Ajay Panicker [Thu, 22 Sep 2016 06:41:02 +0000 (06:41 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 06:39:33 +0000 (06:39 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev
am:
5b05226586
Change-Id: I0b0b672c42a7a4bd75ccbeb2c3a1047eebda5076
Jaewan Kim [Thu, 22 Sep 2016 06:39:24 +0000 (06:39 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service
am:
d1641e8c27
Change-Id: I5be1d931c3a2f2748e69158d442172c327199ef5
Ajay Panicker [Thu, 22 Sep 2016 06:10:41 +0000 (06:10 +0000)]
[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
Jaewan Kim [Thu, 22 Sep 2016 05:19:34 +0000 (05:19 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev
Ajay Panicker [Thu, 22 Sep 2016 04:54:32 +0000 (04:54 +0000)]
[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
Jaewan Kim [Wed, 21 Sep 2016 02:20:54 +0000 (11:20 +0900)]
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
Ajay Panicker [Thu, 22 Sep 2016 03:50:02 +0000 (03:50 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 03:48:40 +0000 (03:48 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
786e2694b1 am:
8fd324c33f
am:
438cc52ca1 -s ours
Change-Id: Iabaa5642ffa6c3417b5e027e2da9b33666b1aacf
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
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
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
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: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: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: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
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
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
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
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: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
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
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 01:36:48 +0000 (01:36 +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
Change-Id: I7e65b0aae28bf10f3c84882990f9c26132709420
Sudheer Shanka [Tue, 20 Sep 2016 00:13:07 +0000 (00:13 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
dce4be63bb am:
a437e7f3f1 am:
c1b2e6db98 -s ours am:
ff9a8d74c7 -s ours
am:
51bcb058ad
Change-Id: If639ceb911ea7cfc977bf053f1e897bd7939564f
Sudheer Shanka [Tue, 20 Sep 2016 00:12:50 +0000 (00:12 +0000)]
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
Sudheer Shanka [Mon, 19 Sep 2016 23:24:48 +0000 (23:24 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am:
d1e3e53d79 am:
a4c9bbefdf
am:
3fca892d3e -s ours
Change-Id: I4d66089c6ec8743f119dd4aab641b22ebdad7b5c
Sudheer Shanka [Mon, 19 Sep 2016 23:02:54 +0000 (23:02 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
dce4be63bb am:
a437e7f3f1 am:
c1b2e6db98 -s ours
am:
ff9a8d74c7 -s ours
Change-Id: I14d6109858bcf02b5f55eb3e207d6bc1918e746a
Sudheer Shanka [Mon, 19 Sep 2016 21:50:49 +0000 (21:50 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
dce4be63bb am:
a437e7f3f1
am:
c1b2e6db98 -s ours
Change-Id: I006233ce7258467da7d5c09c9925bd6048d85ed3
Sudheer Shanka [Mon, 19 Sep 2016 21:50:47 +0000 (21:50 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am:
d1e3e53d79
am:
a4c9bbefdf
Change-Id: I224c2cf56d53acf091a11372f82d1305052c6f18
Sudheer Shanka [Mon, 19 Sep 2016 21:49:26 +0000 (21:49 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am:
b358ee3558 -s ours
am:
43a1f74d7f
Change-Id: I541e01b2d5d76a49908bd3c1557de9ba84a2cc3d
Sudheer Shanka [Mon, 19 Sep 2016 21:02:53 +0000 (21:02 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
dce4be63bb
am:
a437e7f3f1
Change-Id: I13fdcfc2ecca2e5e1d178d61ef8ec6990a0fc3af
Sudheer Shanka [Mon, 19 Sep 2016 20:58:08 +0000 (20:58 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
2d608378f4 -s ours
am:
bab9c1006a
Change-Id: Iab381b1ab450997c5835b68e8dc25e14d8ee34f1
Sudheer Shanka [Mon, 19 Sep 2016 20:47:39 +0000 (20:47 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev
am:
900550de49
Change-Id: I16a545056d2fc3404164a1b63ef79165f46e54f1
Sudheer Shanka [Mon, 19 Sep 2016 20:47:35 +0000 (20:47 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService.
am:
e8340a9ed5
Change-Id: I52277ddde0b68b3be1764f325d04601e48a1cb1e
Sudheer Shanka [Mon, 19 Sep 2016 20:16:17 +0000 (20:16 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev
am:
d1e3e53d79
Change-Id: Id794cb9cd3792317d2786671f2f84a6ad8bbd404
Sudheer Shanka [Mon, 19 Sep 2016 20:16:13 +0000 (20:16 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService.
am:
dce4be63bb
Change-Id: Ia1db0d226d84ed07da6712f554327b49c9fe59c0
Sudheer Shanka [Mon, 19 Sep 2016 20:14:20 +0000 (20:14 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev
am:
b358ee3558 -s ours
Change-Id: Idf726fba98ec0e78135498248d111d8571324657
Sudheer Shanka [Mon, 19 Sep 2016 20:14:16 +0000 (20:14 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService.
am:
2d608378f4 -s ours
Change-Id: Ie6c10a3ef11ea0ec560f20ef49f14f46184d1a4d
Sudheer Shanka [Mon, 19 Sep 2016 20:01:47 +0000 (20:01 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev
Sudheer Shanka [Mon, 19 Sep 2016 19:59:18 +0000 (19:59 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev
Sudheer Shanka [Mon, 19 Sep 2016 19:59:14 +0000 (19:59 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev
Paul Jensen [Mon, 19 Sep 2016 14:37:29 +0000 (14:37 +0000)]
Fix build break due to automerge of
7d2198b5
am:
baae57ab24
Change-Id: Iafcc207308b94d37a04d196def0e7c7a5ce037d9
OSDN Git Service
