Romain Guy
0cd04a0d83
am 06c2bad6: am 96aadf83: Merge "Prevent AsyncTask from creating too many threads Bug #10228005 " into klp-dev
...
* commit '06c2bad60079099b2496f2939655b72ffc649b29':
Prevent AsyncTask from creating too many threads Bug #10228005
2013-08-09 17:13:55 -07:00
Romain Guy
06c2bad600
am 96aadf83: Merge "Prevent AsyncTask from creating too many threads Bug #10228005 " into klp-dev
...
* commit '96aadf837c876b53bfb9ead9223c92bf138e586a':
Prevent AsyncTask from creating too many threads Bug #10228005
2013-08-09 17:11:16 -07:00
Romain Guy
96aadf837c
Merge "Prevent AsyncTask from creating too many threads Bug #10228005 " into klp-dev
2013-08-10 00:07:22 +00:00
Baligh Uddin
6f2eee0bc2
Merge "Import translations. DO NOT MERGE"
2013-08-10 00:05:16 +00:00
Baligh Uddin
40885045a5
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-08-10 00:02:40 +00:00
Dianne Hackborn
7ab53c3356
am d021b6b1: am b0037316: Merge "More stuff I need for the proc stats UI." into klp-dev
...
* commit 'd021b6b14a801cce1b575d536323af65587f2fbe':
More stuff I need for the proc stats UI.
2013-08-09 16:45:26 -07:00
Dianne Hackborn
d021b6b14a
am b0037316: Merge "More stuff I need for the proc stats UI." into klp-dev
...
* commit 'b0037316c4bbaf9d5b3ee8af563caf2539def564':
More stuff I need for the proc stats UI.
2013-08-09 16:38:09 -07:00
Dianne Hackborn
b0037316c4
Merge "More stuff I need for the proc stats UI." into klp-dev
2013-08-09 23:19:07 +00:00
Dianne Hackborn
69cb00b8dd
More stuff I need for the proc stats UI.
...
Change-Id: I5f05b79bc4d5766a80f2db9d20ba8078b60c1b00
2013-08-09 16:16:56 -07:00
Romain Guy
719c44e03b
Prevent AsyncTask from creating too many threads
...
Bug #10228005
From the ThreadPoolExecutor documentation:
- If fewer than corePoolSize threads are running, the Executor
always prefers adding a new thread rather than queuing.
- If corePoolSize or more threads are running, the Executor
always prefers queuing a request rather than adding a new thread.
- If a request cannot be queued, a new thread is created unless
this would exceed maximumPoolSize, in which case, the task will
be rejected.
Before this change AsyncTask could create up to 128 threads because
of the limited queue of 10 items (the capacity of a blocking queue
is fixed.)
This change increases the size of the queue to 128 items and reduces
the maximum number of threads to the number of CPU cores * 2 + 1.
Apps can still submit the same number of tasks.
Change-Id: I015d77b53b6a9fda39c618830b34d45a10de5571
2013-08-09 16:15:18 -07:00
Matthew Williams
98ecf58e3e
Merge "Fix for scheduling conflicts, address fred's comments"
2013-08-09 23:04:50 +00:00
Chet Haase
1802d4bfd8
am 17198172: am 2b2d313e: Merge "Reduce amount of invalidation when old-style animations are running" into klp-dev
...
* commit '1719817211743cabf53e06761ad5540518544273':
Reduce amount of invalidation when old-style animations are running
2013-08-09 15:58:51 -07:00
Chet Haase
1719817211
am 2b2d313e: Merge "Reduce amount of invalidation when old-style animations are running" into klp-dev
...
* commit '2b2d313e865e8aae3296257ed852374b15fa05ad':
Reduce amount of invalidation when old-style animations are running
2013-08-09 15:54:24 -07:00
keunyoung
b62368a515
am c9bf4052: am f6c7a5fd: Merge "add local focus mode and input event injection API to Window" into klp-dev
...
* commit 'c9bf4052c71d7f473c781363bc7ff757a427c0e3':
add local focus mode and input event injection API to Window
2013-08-09 15:54:05 -07:00
Colin Cross
fc917703fc
am 00b581de: am dd78a0fb: Merge "parse named anonymous memory for dumpsys meminfo" into klp-dev
...
* commit '00b581de0e3ef49ea10c5ff039d272df086750e6':
parse named anonymous memory for dumpsys meminfo
2013-08-09 15:53:57 -07:00
Martijn Coenen
bc66a3736f
am b59dbedc: am 4bcc8ee6: Merge "NFC: always upper-case parsed AIDs." into klp-dev
...
* commit 'b59dbedceddc18e94fa75fe87523cf026e4e79b6':
NFC: always upper-case parsed AIDs.
2013-08-09 15:53:54 -07:00
Alan Viverette
30a16d02e5
am bd430b25: am be11c364: Merge "Fix padding adjustment for scrollbars in View, FastScroller" into klp-dev
...
* commit 'bd430b250880f8376bb4c59f62c627d90ae14324':
Fix padding adjustment for scrollbars in View, FastScroller
2013-08-09 15:53:51 -07:00
Geoffrey Borggaard
310cf7a86e
am d1715fda: am 9b59e5aa: Merge "Add a name to the DeviceOwner" into klp-dev
...
* commit 'd1715fdaaf2a11484e6dc60710f13e2495cf6bbb':
Add a name to the DeviceOwner
2013-08-09 15:53:43 -07:00
Fabrice Di Meglio
c9ff18ba46
am e4e68219: am 88dced29: Merge "Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP" into klp-dev
...
* commit 'e4e68219ded0920f0e92ecce6e1cf220603942dc':
Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP
2013-08-09 15:53:40 -07:00
Dianne Hackborn
9e84538c96
am 003b944d: am d81a15c6: Merge "Add method for adding two ProcessStats objects together." into klp-dev
...
* commit '003b944d495bd8a54b61fa565a268dd2c9c21ba1':
Add method for adding two ProcessStats objects together.
2013-08-09 15:53:36 -07:00
Elliott Hughes
0065bba7f8
am 795a7dec: am 5adfb21e: am a0b320a6: Merge "Remove possible leak when exception occurred."
...
* commit '795a7decc2e9e547e0cf6291567d427a2a60517a':
Remove possible leak when exception occurred.
2013-08-09 15:53:28 -07:00
Chet Haase
2b2d313e86
Merge "Reduce amount of invalidation when old-style animations are running" into klp-dev
2013-08-09 22:50:35 +00:00
keunyoung
c9bf4052c7
am f6c7a5fd: Merge "add local focus mode and input event injection API to Window" into klp-dev
...
* commit 'f6c7a5fd6680d74972738e60ad5c9cf34bfc43ef':
add local focus mode and input event injection API to Window
2013-08-09 15:22:35 -07:00
Colin Cross
00b581de0e
am dd78a0fb: Merge "parse named anonymous memory for dumpsys meminfo" into klp-dev
...
* commit 'dd78a0fb0d537e0bb2aa5b7a7b58bce55bb57029':
parse named anonymous memory for dumpsys meminfo
2013-08-09 15:22:28 -07:00
Martijn Coenen
b59dbedced
am 4bcc8ee6: Merge "NFC: always upper-case parsed AIDs." into klp-dev
...
* commit '4bcc8ee682bb879f1020942be03616b506d2c802':
NFC: always upper-case parsed AIDs.
2013-08-09 15:22:25 -07:00
Alan Viverette
bd430b2508
am be11c364: Merge "Fix padding adjustment for scrollbars in View, FastScroller" into klp-dev
...
* commit 'be11c364e77a9d805cde9bfe5530cbc7b2afd3aa':
Fix padding adjustment for scrollbars in View, FastScroller
2013-08-09 15:22:22 -07:00
Geoffrey Borggaard
d1715fdaaf
am 9b59e5aa: Merge "Add a name to the DeviceOwner" into klp-dev
...
* commit '9b59e5aa9cd5d239b18f5b864959fb2feae05665':
Add a name to the DeviceOwner
2013-08-09 15:22:17 -07:00
Fabrice Di Meglio
e4e68219de
am 88dced29: Merge "Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP" into klp-dev
...
* commit '88dced29361c463299e55f059c9d4a7610116ef6':
Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP
2013-08-09 15:22:12 -07:00
Dianne Hackborn
003b944d49
am d81a15c6: Merge "Add method for adding two ProcessStats objects together." into klp-dev
...
* commit 'd81a15c6b77c94109d0a08bc7355f62301fe9234':
Add method for adding two ProcessStats objects together.
2013-08-09 15:22:07 -07:00
Chet Haase
2632b5d0d2
Reduce amount of invalidation when old-style animations are running
...
Previously, old animations (view.animation.*) would cause invalidations on
both the area of the child view and then the entire parent area. There's no
reason for the second invalidation; only the child area need be redrawn.
Issue #10229470 Old animation code in View.draw() may be invalidating too much
Change-Id: I4d0d16321e20b2f34dc579eacf5d3841aed33d6d
2013-08-09 15:05:14 -07:00
Elliott Hughes
795a7decc2
am 5adfb21e: am a0b320a6: Merge "Remove possible leak when exception occurred."
...
* commit '5adfb21e3a3eb6e4628a2f1c8976e6d781492933':
Remove possible leak when exception occurred.
2013-08-09 15:04:06 -07:00
Elliott Hughes
5adfb21e3a
am a0b320a6: Merge "Remove possible leak when exception occurred."
...
* commit 'a0b320a66f6467107edac57f3f41471d9d550507':
Remove possible leak when exception occurred.
2013-08-09 15:02:10 -07:00
Elliott Hughes
a0b320a66f
Merge "Remove possible leak when exception occurred."
2013-08-09 21:58:37 +00:00
keunyoung
f6c7a5fd66
Merge "add local focus mode and input event injection API to Window" into klp-dev
2013-08-09 21:51:30 +00:00
Colin Cross
dd78a0fb0d
Merge "parse named anonymous memory for dumpsys meminfo" into klp-dev
2013-08-09 21:24:08 +00:00
Martijn Coenen
4bcc8ee682
Merge "NFC: always upper-case parsed AIDs." into klp-dev
2013-08-09 20:50:52 +00:00
Alan Viverette
be11c364e7
Merge "Fix padding adjustment for scrollbars in View, FastScroller" into klp-dev
2013-08-09 20:46:02 +00:00
Martijn Coenen
62c196abd2
NFC: always upper-case parsed AIDs.
...
Also added activity intent action for Tap&Pay settings.
Change-Id: I5648e1ded3b79a3363899d1cab8aec55842b3e22
2013-08-09 13:43:34 -07:00
Colin Cross
cb4728f247
parse named anonymous memory for dumpsys meminfo
...
Treat [anon:libc_malloc] as native heap and anything else that
starts with [anon: as unknown.
Bug: 10212959
Change-Id: Ifd120ae86e7a22291383df37d2b96f9f2dcd68b9
2013-08-09 20:37:23 +00:00
Matthew Williams
96ca46cf87
Fix for scheduling conflicts, address fred's comments
...
The last set of comments asked for a renaming. Rather than
confuse the issue now, this patch set focuses on the internals
and API changes can come later.
Renamed AnonymousSyncAdapter -> SyncServiceAdapter
Change-Id: I596ea2f7367b83b357b2f4b56e069448d5591b2a
2013-08-09 13:37:04 -07:00
Geoffrey Borggaard
9b59e5aa9c
Merge "Add a name to the DeviceOwner" into klp-dev
2013-08-09 20:27:26 +00:00
Geoffrey Borggaard
334c7e32d4
Add a name to the DeviceOwner
...
We will need to display the name of the device owner (the human
readable name of the institution) to the user.
"This device is managed by google.com"
Change-Id: Ic33b6530c19cb14a118245692697205de3911a58
2013-08-09 15:56:52 -04:00
Fabrice Di Meglio
88dced2936
Merge "Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP" into klp-dev
2013-08-09 19:54:19 +00:00
Dianne Hackborn
60444fd594
Add method for adding two ProcessStats objects together.
...
Also move file reading code over to ProcessStats.
Change-Id: Ib42272b90a408a494044965e98beed16c0b3f8a5
2013-08-09 12:08:17 -07:00
Alan Viverette
26bb253b40
Fix padding adjustment for scrollbars in View, FastScroller
...
BUG: 10224791,10248282
Change-Id: Ia89d2cbea163b7cad567ea37161552c1cfd66045
2013-08-09 10:40:50 -07:00
Mathias Agopian
e4a3e936ef
am 2464fcdf: am 5893a97c: Merge "fix-up dependencies to gl headers" into klp-dev
...
* commit '2464fcdf4cb33b5bfc1e4b0d61e3b9e42cffdf46':
fix-up dependencies to gl headers
2013-08-09 06:07:21 -07:00
Jeff Sharkey
e7da9c3c4a
am 87a61b83: am 8a65f5b8: Merge "Allow packages.list access with new GID." into klp-dev
...
* commit '87a61b838c5cc411853317663beaa46539fd56ef':
Allow packages.list access with new GID.
2013-08-09 06:06:58 -07:00
Jonathan Dixon
5abec6ec5f
am de3ff4b4: am 42773328: Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev
...
* commit 'de3ff4b4859a92a19d84b33f5a93a0b3454698e6':
Refactor Canvas.drawPicture() to delegate to Picture
2013-08-09 06:06:55 -07:00
Wink Saville
f90de3a2b5
am 8418a309: am 89d16f75: am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
...
* commit '8418a309a3e228538a2cf921f386326a9afe394b':
If in a mobile captive portal is detected enable fail fast.
2013-08-09 06:06:42 -07:00
Wink Saville
f5e5ae65aa
am 8eec0cbe: am 292a92e3: am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
...
* commit '8eec0cbe01064156c52a87592796a4352f31a451':
Have CaptivePortalTracker use gservices updateable provisioning urls.
2013-08-09 06:06:39 -07:00