199363 Commits

Author SHA1 Message Date
Sudheer Shanka
ac143d2dfd DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a
am: e85152c2fc

Change-Id: Iff935eccf136c6c85b2373cfd113e9f6d6d9c9fc
2016-09-19 23:22:39 +00:00
Sudheer Shanka
e44f8fcca4 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb
am: 271aa24036  -s ours

Change-Id: Icaccd5612147cad9679f98476cf92bb3216e94f1
2016-09-19 23:04:23 +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
426ba52b42 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49
am: 94da8023d5

Change-Id: Iedc174184adc89009ce498558a496b72d1c31a05
2016-09-19 22:45:40 +00:00
Sudheer Shanka
271aa24036 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5
am: 5c53e1b8bb

Change-Id: Icd67597290378b8b62328cbfafa35fd0fc0497b6
2016-09-19 22:35:55 +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
Sudheer Shanka
e8e30122e8 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours
am: 43a1f74d7f

Change-Id: I541e01b2d5d76a49908bd3c1557de9ba84a2cc3d
2016-09-19 21:49:26 +00:00
Sudheer Shanka
c1b2e6db98 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb
am: a437e7f3f1

Change-Id: I13fdcfc2ecca2e5e1d178d61ef8ec6990a0fc3af
2016-09-19 21:02:53 +00:00
Sudheer Shanka
e85152c2fc DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours
am: bab9c1006a

Change-Id: Iab381b1ab450997c5835b68e8dc25e14d8ee34f1
2016-09-19 20:58:08 +00:00
Sudheer Shanka
94da8023d5 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev
am: 900550de49

Change-Id: I16a545056d2fc3404164a1b63ef79165f46e54f1
2016-09-19 20:47:39 +00:00
Sudheer Shanka
5c53e1b8bb DO NOT MERGE: Fix deadlock in AcitivityManagerService.
am: e8340a9ed5

Change-Id: I52277ddde0b68b3be1764f325d04601e48a1cb1e
2016-09-19 20:47:35 +00:00
Sudheer Shanka
a4c9bbefdf Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev
am: d1e3e53d79

Change-Id: Id794cb9cd3792317d2786671f2f84a6ad8bbd404
2016-09-19 20:16:17 +00:00
Sudheer Shanka
a437e7f3f1 DO NOT MERGE: Fix deadlock in AcitivityManagerService.
am: dce4be63bb

Change-Id: Ia1db0d226d84ed07da6712f554327b49c9fe59c0
2016-09-19 20:16:13 +00:00
Sudheer Shanka
43a1f74d7f Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev
am: b358ee3558  -s ours

Change-Id: Idf726fba98ec0e78135498248d111d8571324657
2016-09-19 20:14:20 +00:00
Sudheer Shanka
bab9c1006a DO NOT MERGE: Fix deadlock in AcitivityManagerService.
am: 2d608378f4  -s ours

Change-Id: Ie6c10a3ef11ea0ec560f20ef49f14f46184d1a4d
2016-09-19 20:14:16 +00:00
Sudheer Shanka
b358ee3558 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev 2016-09-19 20:01:51 +00:00
Sudheer Shanka
d1e3e53d79 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev 2016-09-19 19:59:22 +00:00
Sudheer Shanka
900550de49 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev 2016-09-19 19:59:18 +00:00
Sudheer Shanka
38077274d0 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev 2016-09-19 19:59:13 +00:00
Paul Jensen
a81dd677d3 Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f
am: d6a5f68f52

Change-Id: I55e5c90dd0b2c52a1cbee5d6be14a339157d6a75
2016-09-19 14:50:48 +00:00
Paul Jensen
d6a5f68f52 Fix build break due to automerge of 7d2198b5 am: baae57ab24
am: 009e08116f

Change-Id: Ied1bf21ec09d9774bd0f12d2688244fe7dc2bd80
2016-09-19 14:43:28 +00:00
Paul Jensen
009e08116f Fix build break due to automerge of 7d2198b5
am: baae57ab24

Change-Id: Iafcc207308b94d37a04d196def0e7c7a5ce037d9
2016-09-19 14:37:29 +00:00
Paul Jensen
baae57ab24 Fix build break due to automerge of 7d2198b5
Bug: 30100884

Change-Id: I8fa379a74b5d9467b5b9498bd18de2a043963c6f
2016-09-19 13:27:41 +00:00
Paul Jensen
c875015cc5 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
2016-09-19 12:01:57 +00:00
Paul Jensen
4121b70a7d 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
2016-09-19 11:55:30 +00:00
Paul Jensen
2855de1e7c 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
2016-09-19 11:55:24 +00:00
Paul Jensen
4fd2cc7277 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
2016-09-19 11:50:42 +00:00
Paul Jensen
b7ba9fd70f 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
2016-09-19 11:50:23 +00:00
Paul Jensen
ddce8664bd Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9
am: d37eb76465

Change-Id: I2433d723fd9ec13774eff4aa40a089e73932f357
2016-09-19 11:44:22 +00:00
Paul Jensen
849f1ba2d9 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
2016-09-19 11:40:02 +00:00
Paul Jensen
d37eb76465 Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 am: 6634e90ad7
am: 66ee2296a9

Change-Id: Ib0023b44e521b936ab2f9450ad367b1feda64492
2016-09-19 11:37:54 +00:00
Paul Jensen
3532f10fcb Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c045807b am: 7c08c4d5cc
am: 963ca6f947

Change-Id: I1a509c39640e7f9d76bd2e420764aeb3d823a3df
2016-09-19 11:34:00 +00:00
Paul Jensen
66ee2296a9 Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273
am: 6634e90ad7

Change-Id: Id46b32b80d47f6b7e2bfab2740978377a6b711cf
2016-09-19 11:31:54 +00:00
Paul Jensen
963ca6f947 Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c045807b
am: 7c08c4d5cc

Change-Id: Idd0a3598ffac808a39703a23238b47a02bca66ed
2016-09-19 11:27:47 +00:00
Paul Jensen
6634e90ad7 Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586
am: 9c1cb7a273

Change-Id: I8cd4b0d33da22bc29abd176672659c3eeb8c7d5b
2016-09-19 11:25:21 +00:00
Paul Jensen
7c08c4d5cc Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev
am: 96c045807b

Change-Id: Ia20ba679f7b0445567b43aa74eef27f751453d4e
2016-09-19 11:19:16 +00:00
Paul Jensen
9c1cb7a273 Avoid crashing when downloading MitM'd PAC that is too big
am: 7d2198b586

Change-Id: I512d6f9de6a92dd3cabec93bcadf437f5cf2e16d
2016-09-19 11:19:13 +00:00
Paul Jensen
96c045807b Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev 2016-09-19 11:11:06 +00:00
Tadashi G. Takaoka
839671d5a9 DO NOT MERGE: Catch all exceptions when parsing IME meta data am: f71d2cddf1 am: 57454cf15e am: 29f2e1d93a -s ours am: 2578264b86 -s ours am: 94537b171c am: 9bb068a5ad
am: 22c8e0b51d  -s ours

Change-Id: I55c117eeaeaaf2801fc19fdc6619a20fc17c13a2
2016-09-18 13:40:52 +00:00
Tadashi G. Takaoka
22c8e0b51d DO NOT MERGE: Catch all exceptions when parsing IME meta data am: f71d2cddf1 am: 57454cf15e am: 29f2e1d93a -s ours am: 2578264b86 -s ours am: 94537b171c
am: 9bb068a5ad

Change-Id: I0e4ea875ea14217e98ed5df3642046ce8d3db52a
2016-09-18 13:18:57 +00:00
Tadashi G. Takaoka
9bb068a5ad DO NOT MERGE: Catch all exceptions when parsing IME meta data am: f71d2cddf1 am: 57454cf15e am: 29f2e1d93a -s ours am: 2578264b86 -s ours
am: 94537b171c

Change-Id: I382b954e67faa6ebf662349a763aafe8704ae711
2016-09-18 13:03:08 +00:00
Tadashi G. Takaoka
94537b171c DO NOT MERGE: Catch all exceptions when parsing IME meta data am: f71d2cddf1 am: 57454cf15e am: 29f2e1d93a -s ours
am: 2578264b86  -s ours

Change-Id: I0f5483480d7ba6c5a5386635fabc0db0bb5aefdb
2016-09-18 12:47:22 +00:00
Tadashi G. Takaoka
2e0a30efd9 Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am: 5fa097311c -s ours am: 233e3b22f9 am: c296565749
am: dd583cf069  -s ours

Change-Id: I72554dbf5ccc292baf9a6769c0f52a66cc7d33ee
2016-09-18 12:29:44 +00:00
Tadashi G. Takaoka
ee518e410b DO NOT MERGE: Catch all exceptions when parsing IME meta data am: c6fc6c3b55 -s ours am: 076f262197 am: 3b06511a95
am: 61d39b340a  -s ours

Change-Id: I8a3cba1aaacab87ac5b2ab00c29c7c52f3c8a55c
2016-09-18 12:27:12 +00:00
Tadashi G. Takaoka
dd583cf069 Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am: 5fa097311c -s ours am: 233e3b22f9
am: c296565749

Change-Id: I3b97c7b101c53c77f03c889d945d4630edebee44
2016-09-18 12:23:36 +00:00
Tadashi G. Takaoka
2578264b86 DO NOT MERGE: Catch all exceptions when parsing IME meta data am: f71d2cddf1 am: 57454cf15e
am: 29f2e1d93a  -s ours

Change-Id: Iaed8d1cc6e6a6bf00a9602ebb829d008f8c4e56e
2016-09-18 12:22:55 +00:00
Tadashi G. Takaoka
a53a42f049 Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am: 8fa8da727b am: 9ef783599b
am: 8310560c62  -s ours

Change-Id: I4091f8ea0cff4720b792d49ee2d5f5cd9c3d3027
2016-09-18 12:21:50 +00:00
Tadashi G. Takaoka
61d39b340a DO NOT MERGE: Catch all exceptions when parsing IME meta data am: c6fc6c3b55 -s ours am: 076f262197
am: 3b06511a95

Change-Id: Ia01e63fcf975c21136c0b0206ecd413ec3d975ad
2016-09-18 12:21:41 +00:00
Tadashi G. Takaoka
9b5fba5f32 DO NOT MERGE: Catch all exceptions when parsing IME meta data am: 43f4980e77 am: cd8595cdcf
am: f9dac671ca  -s ours

Change-Id: I252b7a8870a3b161a72e1fd7e0dcc7943e6d08ed
2016-09-18 12:17:27 +00:00