Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
253,881 Commits 3 Branches 0 Tags
104f8053370f9e01ac2e8e23bc31d128e5fcc00b
Commit Graph

253881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Jensen
a728ecff98 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 am: c875015cc5 am: 66482b555a 
am: bedb94754b

Change-Id: I32f3d45fd9c0b1969ca0c566eaed97e006cc7aea
 2016-09-19 12:21:39 +00:00
Paul Jensen
d3a9c09052 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 am: 2855de1e7c am: 53a9c65c8d 
am: 34e77bb699

Change-Id: I205e3c3fe88b28525cd2ec06830dcc9e40b453bb
 2016-09-19 12:15:21 +00:00
Paul Jensen
bedb94754b 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 am: c875015cc5 
am: 66482b555a

Change-Id: I56c9c0235ef6a77764f5d4fc8a77afd7bd34d35b
 2016-09-19 12:15:07 +00:00
Paul Jensen
34e77bb699 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 am: 2855de1e7c 
am: 53a9c65c8d

Change-Id: Ib5ce70593ec69419bc3ed839ce8cc77b52a32120
 2016-09-19 12:08:26 +00:00
Paul Jensen
66482b555a 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 
am: c875015cc5

Change-Id: Ic04dd9fcf708873b95113814eeba18501861a32a
 2016-09-19 12:08:02 +00:00
Paul Jensen
53a9c65c8d 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 
am: 2855de1e7c

Change-Id: I67e399dc97073387b2c0c6769bf9b4b19cb91a62
 2016-09-19 12:02:09 +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
Richard Uhler
2c0361986b Add count of WebView instances to meminfo 
Switch to using more efficient countInstancesOfClasses method for
counting WebView and other kinds of instances.

Test: Launch Gmail, view a message, verify some WebView objects are
      reported in dumpsys meminfo.
Bug: 31016396

Change-Id: Ib0146ee2931877399da07f854d50c2ab52092b6b
 2016-09-19 08:59:23 +01:00
Scott Main
d9ffa0b952 Merge "Revert "Revert "add dev guide for constraint layout.""" into nyc-dev am: e89de23e0a 
am: d49352abeb

Change-Id: Iafe1cc8a0e8e880b7dcef6fdc4bf77dc9164a0ca
 2016-09-19 00:37:19 +00:00
Scott Main
9133e0d31f Revert "Revert "add dev guide for constraint layout."" am: 02c72bc570 
am: 485bc9a5cd

Change-Id: Ie0a04084c2637b5da971955a462729cc019afc7d
 2016-09-19 00:35:23 +00:00
Scott Main
d49352abeb Merge "Revert "Revert "add dev guide for constraint layout.""" into nyc-dev 
am: e89de23e0a

Change-Id: Icd7dd5f73e42c732df8a95adbb4cfdbe50c38219
 2016-09-19 00:28:50 +00:00
Scott Main
485bc9a5cd Revert "Revert "add dev guide for constraint layout."" 
am: 02c72bc570

Change-Id: Ie2ea280700f27b0b10d2289dc880c7cc17b0e607
 2016-09-19 00:28:47 +00:00
Scott Main
e89de23e0a Merge "Revert "Revert "add dev guide for constraint layout.""" into nyc-dev 2016-09-19 00:20:07 +00:00
Scott Main
02c72bc570 Revert "Revert "add dev guide for constraint layout."" 
Studio 2.2 launch is back on.

This reverts commit e6469e8211.

Change-Id: I1fd2bccf2bab302b81fc520ca1d2c34155f6cde7
 2016-09-19 00:18:30 +00:00
Eino-Ville Talvala
3fc21ef78b DngCreator: Fix calculation of date/time stamps 
Converting the sensor timestamp to date/time requires checking
what the timebase of those timestamps is; getting it wrong will
create drift that increases with device uptime.

Test: android.hardware.camera2.cts.
      DngCreatorTest#testSingleImageThumbnail
Bug: 30125412
Change-Id: Ia5db86012bc9e1c06463b8dc4434d3e063f62cf5
 2016-09-18 17:11:41 -07:00
Tadashi G. Takaoka
7538bb68cd 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 am: 839671d5a9 am: 20a8b9fd96 am: 52dc21f1b5 am: 0d0aed3fc2 -s ours am: 1262ae1aa2 
am: ed9a4cb2e5

Change-Id: I3a137d612a728396cab5b6d9ecc2d4dbe2b08884
 2016-09-18 15:09:29 +00:00
Tadashi G. Takaoka
ed9a4cb2e5 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 am: 839671d5a9 am: 20a8b9fd96 am: 52dc21f1b5 am: 0d0aed3fc2 -s ours 
am: 1262ae1aa2

Change-Id: I040a343f0fa06aee0c7d6f5df265631c571c3b92
 2016-09-18 14:55:22 +00:00
Tadashi G. Takaoka
1262ae1aa2 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 am: 839671d5a9 am: 20a8b9fd96 am: 52dc21f1b5 
am: 0d0aed3fc2  -s ours

Change-Id: I88631b5eb5ceb4ec6598a0ddff58daab7a172d13
 2016-09-18 14:44:36 +00:00
Tadashi G. Takaoka
257442d803 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 am: 2e0a30efd9 am: 7662370f49 am: e809fe6103 am: f36da244c2 -s ours am: 333e229590 
am: 2101892b83

Change-Id: Ia11b0bda388cfc7e863e20bc1b8e249669ae6569
 2016-09-18 14:38:35 +00:00
Tadashi G. Takaoka
45d36156b1 DO NOT MERGE: Catch all exceptions when parsing IME meta data am: c6fc6c3b55 -s ours am: 076f262197 am: 3b06511a95 am: 61d39b340a -s ours am: ee518e410b am: c8334a8844 am: 08871df950 am: bed85b31f1 -s ours am: 2ad63214ab 
am: 862aed51df

Change-Id: Id0ec3b0e8c5e2fe9e9ab1fa8861c45836218bb04
 2016-09-18 14:33:23 +00:00
Tadashi G. Takaoka
0d0aed3fc2 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 am: 839671d5a9 am: 20a8b9fd96 
am: 52dc21f1b5

Change-Id: Ia5613701d6c8c4b25c30053c2a45496a76d0d18a
 2016-09-18 14:33:22 +00:00
Tadashi G. Takaoka
2101892b83 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 am: 2e0a30efd9 am: 7662370f49 am: e809fe6103 am: f36da244c2 -s ours 
am: 333e229590

Change-Id: I7bce6afc9b0080e850b4f9cab6240e5cabd2f822
 2016-09-18 14:33:21 +00:00
Tadashi G. Takaoka
862aed51df DO NOT MERGE: Catch all exceptions when parsing IME meta data am: c6fc6c3b55 -s ours am: 076f262197 am: 3b06511a95 am: 61d39b340a -s ours am: ee518e410b am: c8334a8844 am: 08871df950 am: bed85b31f1 -s ours 
am: 2ad63214ab

Change-Id: I34e349479add1f082366620c45b981743a48654a
 2016-09-18 14:23:08 +00:00
Tadashi G. Takaoka
52dc21f1b5 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 am: 839671d5a9 
am: 20a8b9fd96

Change-Id: I4fd4bbbcdb81a1f95f0a647908f60da8b818b78e
 2016-09-18 14:22:41 +00:00
Tadashi G. Takaoka
3934b76d2a Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am: 8fa8da727b am: 9ef783599b am: 8310560c62 -s ours am: a53a42f049 am: beb643c169 am: f9952084d4 am: 9f0144c167 -s ours am: 89a4a5310b 
am: a72a8f9293

Change-Id: Ic1ffce00a0e7eb6bace7ceab92a3b469ff7df0e7
 2016-09-18 14:22:41 +00:00
Tadashi G. Takaoka
333e229590 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 am: 2e0a30efd9 am: 7662370f49 am: e809fe6103 
am: f36da244c2  -s ours

Change-Id: Ic7a4e082949ce207b019217d2c791dcc08dcb3ca
 2016-09-18 14:17:14 +00:00
Tadashi G. Takaoka
20a8b9fd96 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 
am: 839671d5a9

Change-Id: I04ba40b04c2127a11bc70b1952a452a404275a9e
 2016-09-18 14:12:15 +00:00
Tadashi G. Takaoka
2ad63214ab DO NOT MERGE: Catch all exceptions when parsing IME meta data am: c6fc6c3b55 -s ours am: 076f262197 am: 3b06511a95 am: 61d39b340a -s ours am: ee518e410b am: c8334a8844 am: 08871df950 
am: bed85b31f1  -s ours

Change-Id: Ie96d58c0c17059a390e5c83b77fb5a74a43120d5
 2016-09-18 14:11:39 +00:00
Tadashi G. Takaoka
a72a8f9293 Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am: 8fa8da727b am: 9ef783599b am: 8310560c62 -s ours am: a53a42f049 am: beb643c169 am: f9952084d4 am: 9f0144c167 -s ours 
am: 89a4a5310b

Change-Id: Iabe55d728f4a191ffc6be9275ac7aea55ba199d7
 2016-09-18 14:11:23 +00:00
Tadashi G. Takaoka
89a4a5310b Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am: 8fa8da727b am: 9ef783599b am: 8310560c62 -s ours am: a53a42f049 am: beb643c169 am: f9952084d4 
am: 9f0144c167  -s ours

Change-Id: I1f51ff99ef0b24f0267846261e5f8a85c95fff80
 2016-09-18 14:01:49 +00:00
Tadashi G. Takaoka
5a9c45dffc DO NOT MERGE: Catch all exceptions when parsing IME meta data am: 43f4980e77 am: cd8595cdcf am: f9dac671ca -s ours am: 9b5fba5f32 am: d3995603f6 am: bb84821bad am: 138cb42dc8 -s ours am: 85f23f9632 
am: cd6a02e924

Change-Id: I7e0a28d1fa42a16c774ec2c718c565e8b344971b
 2016-09-18 13:59:57 +00:00
Tadashi G. Takaoka
f36da244c2 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 am: 2e0a30efd9 am: 7662370f49 
am: e809fe6103

Change-Id: Ie2b90640e104986d656ae1c575afd8df646c916b
 2016-09-18 13:51:22 +00:00
Tadashi G. Takaoka
bed85b31f1 DO NOT MERGE: Catch all exceptions when parsing IME meta data am: c6fc6c3b55 -s ours am: 076f262197 am: 3b06511a95 am: 61d39b340a -s ours am: ee518e410b am: c8334a8844 
am: 08871df950

Change-Id: I01d1eaf8fb57f45f157bd5a04772917dc600682b
 2016-09-18 13:43:36 +00:00
Tadashi G. Takaoka
e809fe6103 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 am: 2e0a30efd9 
am: 7662370f49

Change-Id: I3613632c10e3f6b8733d77f3bf1f3076342580fa
 2016-09-18 13:41:01 +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
9f0144c167 Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am: 8fa8da727b am: 9ef783599b am: 8310560c62 -s ours am: a53a42f049 am: beb643c169 
am: f9952084d4

Change-Id: Ic125a89e5ecd3836a4bc1e410048f24256b788cd
 2016-09-18 13:40:19 +00:00