OSDN Git Service
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
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
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: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: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: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: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: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
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
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
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
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 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
Sudheer Shanka [Tue, 20 Sep 2016 02:20:58 +0000 (02:20 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am:
b358ee3558 -s ours am:
43a1f74d7f am:
e8e30122e8
am:
fcc3d8fca2 -s ours
Change-Id: I1489cbfc74d97cb5e64cc712c480d556e227285e
Sudheer Shanka [Tue, 20 Sep 2016 01:38:53 +0000 (01:38 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
dce4be63bb am:
a437e7f3f1 am:
c1b2e6db98 -s ours am:
ff9a8d74c7 -s ours am:
51bcb058ad
am:
c6d9bdded2
Change-Id: I854127259e85afb06046253c2d767f12439ae819
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 01:17:14 +0000 (01:17 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
2d608378f4 -s ours am:
bab9c1006a am:
e85152c2fc
am:
ac143d2dfd -s ours
Change-Id: I360338620a6607d882ac8dd13ec9cfbfc8381762
Sudheer Shanka [Tue, 20 Sep 2016 00:13:24 +0000 (00:13 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am:
b358ee3558 -s ours am:
43a1f74d7f
am:
e8e30122e8
Change-Id: Ifae0a5532d455931e6f3dd01c2273e6fd21d3f07
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 [Tue, 20 Sep 2016 00:11:54 +0000 (00:11 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am:
900550de49 am:
94da8023d5
am:
426ba52b42 -s ours
Change-Id: I861ed40fa031d4add94e48b2fbbfb965ef1ca7d2
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:22:39 +0000 (23:22 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
2d608378f4 -s ours am:
bab9c1006a
am:
e85152c2fc
Change-Id: Iff935eccf136c6c85b2373cfd113e9f6d6d9c9fc
Sudheer Shanka [Mon, 19 Sep 2016 23:04:23 +0000 (23:04 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
e8340a9ed5 am:
5c53e1b8bb
am:
271aa24036 -s ours
Change-Id: Icaccd5612147cad9679f98476cf92bb3216e94f1
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 22:45:40 +0000 (22:45 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am:
900550de49
am:
94da8023d5
Change-Id: Iedc174184adc89009ce498558a496b72d1c31a05
Sudheer Shanka [Mon, 19 Sep 2016 22:35:55 +0000 (22:35 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
e8340a9ed5
am:
5c53e1b8bb
Change-Id: Icd67597290378b8b62328cbfafa35fd0fc0497b6
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
Sudheer Shanka [Mon, 19 Sep 2016 19:59:10 +0000 (19:59 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev
Paul Jensen [Mon, 19 Sep 2016 14:50:48 +0000 (14:50 +0000)]
Fix build break due to automerge of
7d2198b5 am:
baae57ab24 am:
009e08116f
am:
d6a5f68f52
Change-Id: I55e5c90dd0b2c52a1cbee5d6be14a339157d6a75
Paul Jensen [Mon, 19 Sep 2016 14:43:28 +0000 (14:43 +0000)]
Fix build break due to automerge of
7d2198b5 am:
baae57ab24
am:
009e08116f
Change-Id: Ied1bf21ec09d9774bd0f12d2688244fe7dc2bd80
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
Paul Jensen [Mon, 19 Sep 2016 12:53:20 +0000 (08:53 -0400)]
Fix build break due to automerge of
7d2198b5
Bug:
30100884
Change-Id: I8fa379a74b5d9467b5b9498bd18de2a043963c6f
Paul Jensen [Mon, 19 Sep 2016 12:01:57 +0000 (12:01 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947 am:
3532f10fcb am:
849f1ba2d9 am:
b7ba9fd70f
am:
4121b70a7d
Change-Id: I225d23b2ad0afa6113c085d2ee7e51c996896902
Paul Jensen [Mon, 19 Sep 2016 11:55:30 +0000 (11:55 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947 am:
3532f10fcb am:
849f1ba2d9
am:
b7ba9fd70f
Change-Id: If57722c1437bd5ea7b3a1fd016cbc7fce8237965
Paul Jensen [Mon, 19 Sep 2016 11:55:24 +0000 (11:55 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7 am:
66ee2296a9 am:
d37eb76465 am:
ddce8664bd
am:
4fd2cc7277
Change-Id: I2bd78344796e888c4fa26dcf2e07a0a24994cb42
Paul Jensen [Mon, 19 Sep 2016 11:50:42 +0000 (11:50 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7 am:
66ee2296a9 am:
d37eb76465
am:
ddce8664bd
Change-Id: I9379db3398f066841fdb5435d8128e2d12bff63b
Paul Jensen [Mon, 19 Sep 2016 11:50:23 +0000 (11:50 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947 am:
3532f10fcb
am:
849f1ba2d9
Change-Id: I3213d64cc5396a22096e3ad484a3f769f03f6cda
Paul Jensen [Mon, 19 Sep 2016 11:44:22 +0000 (11:44 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7 am:
66ee2296a9
am:
d37eb76465
Change-Id: I2433d723fd9ec13774eff4aa40a089e73932f357
Paul Jensen [Mon, 19 Sep 2016 11:40:02 +0000 (11:40 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947
am:
3532f10fcb
Change-Id: I9dc833de510da32d47c4e6b0a78eae4cc7a38832
Paul Jensen [Mon, 19 Sep 2016 11:37:54 +0000 (11:37 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7
am:
66ee2296a9
Change-Id: Ib0023b44e521b936ab2f9450ad367b1feda64492
Paul Jensen [Mon, 19 Sep 2016 11:34:00 +0000 (11:34 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc
am:
963ca6f947
Change-Id: I1a509c39640e7f9d76bd2e420764aeb3d823a3df
Paul Jensen [Mon, 19 Sep 2016 11:31:54 +0000 (11:31 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273
am:
6634e90ad7
Change-Id: Id46b32b80d47f6b7e2bfab2740978377a6b711cf
Paul Jensen [Mon, 19 Sep 2016 11:27:47 +0000 (11:27 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b
am:
7c08c4d5cc
Change-Id: Idd0a3598ffac808a39703a23238b47a02bca66ed
Paul Jensen [Mon, 19 Sep 2016 11:25:21 +0000 (11:25 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586
am:
9c1cb7a273
Change-Id: I8cd4b0d33da22bc29abd176672659c3eeb8c7d5b
Paul Jensen [Mon, 19 Sep 2016 11:19:16 +0000 (11:19 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev
am:
96c045807b
Change-Id: Ia20ba679f7b0445567b43aa74eef27f751453d4e