Jeff Sharkey
1d29a3064f
Move NetworkStatsFactory to faster ProcFileReader.
...
Less GC overhead, and about 8x faster parse times. Verified that
tests pass.
Change-Id: Iff1d374f36103395a193176a88a57eebffa93c56
2012-02-27 18:08:13 -08:00
Jeff Sharkey
453dafa663
Suppress StrictMode when reading /proc/ files.
...
Bug: 6077051
Change-Id: If4f23e947d8b91f9f124baa0460600a6b9353732
2012-02-27 17:42:34 -08:00
Robert Ly
35ae6e2a84
am 718af2f9: am 55a1c40f: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1
...
* commit '718af2f93bbc0eda5a72e736e14b3a08d52799ed':
2012-02-27 11:30:39 -08:00
Robert Ly
718af2f93b
am 55a1c40f: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1
...
* commit '55a1c40fa0f127b442a2e7f0677a3181e28b6ec2':
2012-02-27 11:28:07 -08:00
Robert Ly
4709a11b5d
am 9dc8ea87: am c76ca242: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1
...
* commit '9dc8ea87b5016ca838373ff4996e9c92247aa224':
docs: fix bug 5990526
2012-02-27 08:49:04 -08:00
Robert Ly
9dc8ea87b5
am c76ca242: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1
...
* commit 'c76ca242ce2bd26c97c78ddf6842429850f541d9':
docs: fix bug 5990526
2012-02-27 08:46:00 -08:00
Robert Ly
c76ca242ce
am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1
...
* commit '85cb9dece27c7ebc29b48bd8e5dd3457fa3b6a87':
docs: fix bug 5990526
2012-02-27 08:42:48 -08:00
Robert Ly
55a1c40fa0
am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1
...
* commit '85cb9dece27c7ebc29b48bd8e5dd3457fa3b6a87':
docs: fix bug 5990526
2012-02-27 08:42:19 -08:00
Robert Ly
85cb9dece2
Merge "docs: fix bug 5990526" into ics-mr1
2012-02-27 08:40:54 -08:00
Xavier Ducrohet
9c821d71e9
am 7a879da1: am df154866: am 44e63a21: Support rendering layout that use the new res-auto namespace.
...
* commit '7a879da1571027ef812b1322754f9c1daa378de1':
2012-02-27 07:51:10 -08:00
Xavier Ducrohet
aeb17f17ff
am 77fdcbff: am f038868d: am 44e63a21: Support rendering layout that use the new res-auto namespace.
...
* commit '77fdcbff8b458dd3430b38e60aee1a28ca92a738':
Support rendering layout that use the new res-auto namespace.
2012-02-27 07:51:05 -08:00
Siva Velusamy
0a66900ee5
Merge "gltrace: attach buffer data sent with glBufferData"
2012-02-27 07:41:38 -08:00
Glenn Kasten
40ba9cddea
Merge "Make threadLoop() logs identical"
2012-02-27 07:24:46 -08:00
Glenn Kasten
db316b212f
Merge "Move declaration of mixerStatus to inner block"
2012-02-27 07:21:00 -08:00
Ben Murdoch
1d7b856a97
Merge "Fix looping HTML5 Audio."
2012-02-27 02:17:23 -08:00
Jamie Gennis
c108613fb8
Merge "Removed dependecies between BufferQueue and SurfaceTexture"
2012-02-26 17:06:42 -08:00
Eric Fischer
7fbedadb62
Merge "Import translations. DO NOT MERGE"
2012-02-25 19:34:19 -08:00
Mathias Agopian
f69d204d2d
Merge "attempt to fix IMSFramework crash"
2012-02-24 19:58:05 -08:00
Adam Powell
d020ebff2c
Merge "Fix bug 6065890 - Correct callback sequence for action bar tab switching"
2012-02-24 19:50:11 -08:00
Xavier Ducrohet
7a879da157
am df154866: am 44e63a21: Support rendering layout that use the new res-auto namespace.
...
* commit 'df154866fbad10faf8f9bceb8843aca1e2a69984':
2012-02-24 19:36:34 -08:00
Xavier Ducrohet
77fdcbff8b
am f038868d: am 44e63a21: Support rendering layout that use the new res-auto namespace.
...
* commit 'f038868d74af534effceaa8f1d932f9576f4f647':
Support rendering layout that use the new res-auto namespace.
2012-02-24 19:35:25 -08:00
Xavier Ducrohet
f038868d74
am 44e63a21: Support rendering layout that use the new res-auto namespace.
...
* commit '44e63a218cf8fcab9b4418246a512bd0b0c9157b':
Support rendering layout that use the new res-auto namespace.
2012-02-24 19:32:47 -08:00
Xavier Ducrohet
df154866fb
am 44e63a21: Support rendering layout that use the new res-auto namespace.
...
* commit '44e63a218cf8fcab9b4418246a512bd0b0c9157b':
Support rendering layout that use the new res-auto namespace.
2012-02-24 19:32:32 -08:00
Mathias Agopian
d13f9aa8b1
attempt to fix IMSFramework crash
...
Change-Id: Iad6dd85afe8f37c1e443c116162d75f116c24316
2012-02-24 19:32:03 -08:00
Xavier Ducrohet
44e63a218c
Support rendering layout that use the new res-auto namespace.
...
Change-Id: I9b89c965dc8c9458e74c15ab8ff765e16e1b32c2
2012-02-24 19:29:31 -08:00
Adam Powell
c4e57e23f9
Fix bug 6065890 - Correct callback sequence for action bar tab switching
...
Keep the callback behavior consistent when action bar tabs collapse
into a spinner.
Change-Id: Ia82e55d816a92b7ec746e1d25486bc9d2c0778f4
2012-02-24 19:25:43 -08:00
Daniel Sandler
13ff5331f9
Merge "Fix fullScreenIntents."
2012-02-24 19:10:01 -08:00
Mathias Agopian
018549e4bf
Merge "remove dependency on android_native{s_priv|buffer}.h"
2012-02-24 19:08:12 -08:00
Daniel Sandler
fc6fda3950
Fix fullScreenIntents.
...
The intruder alert stuff was getting activated, but it's not
really ready yet.
Bug: 6070420
Change-Id: If65165e96bddf1e5e4c89ed26131e45639d5cf2d
2012-02-24 22:05:27 -05:00
Dianne Hackborn
5265466e8a
Merge "New development permissions."
2012-02-24 18:40:37 -08:00
Mathias Agopian
af01feafc3
remove dependency on android_native{s_priv|buffer}.h
...
Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
2012-02-24 18:26:01 -08:00
Romain Guy
2abb138152
Merge "More infrastructure for Canvas.drawTextOnPath"
2012-02-24 18:01:47 -08:00
Romain Guy
778f67f7c0
Merge "Add hooks to implement Canvas.drawTextOnPath() in GL"
2012-02-24 18:01:22 -08:00
Romain Guy
03d58520c3
More infrastructure for Canvas.drawTextOnPath
...
Change-Id: Iff42b24e342650d06fa4e2fa9db6c28da820ff01
2012-02-24 17:54:07 -08:00
Jason Sams
b73644a94f
Merge "Make compute work without an app context."
2012-02-24 17:52:59 -08:00
Jason Sams
1a4e1f3efd
Make compute work without an app context.
...
Change-Id: I644b4711135d6f5d9866b6c2e5e6f6a5ceb1f3d4
2012-02-24 17:51:24 -08:00
Gilles Debunne
5cd164c5cf
Merge "Fix NPE on Activity start in TextView"
2012-02-24 17:42:03 -08:00
Gilles Debunne
c1e79b45a2
Fix NPE on Activity start in TextView
...
Bug 6065279
The selection can be created programatically, and mEditor may be null
when it happens.
Make sure mEditor is created to display the selection highlight.
Change-Id: Idd66a5fd4ad327f9b390b539574e6878c794ba4a
2012-02-24 17:40:22 -08:00
Jason Sams
93d083b6ad
Merge "Do RS caching the same way HardwareRenderer does. Eliminates the need for an application context for caching."
2012-02-24 17:21:32 -08:00
Jason Sams
3d408e5010
Merge "test runs but I do not check results yet."
2012-02-24 17:21:02 -08:00
Gilles Debunne
9f809c2fd1
Merge "Fix crash on long press in TextView"
2012-02-24 17:04:10 -08:00
Gilles Debunne
f14634e491
Fix crash on long press in TextView
...
Bug 6058792
Glitch in mEditor handling
Change-Id: I9b68796d5038c20d190ba5fbdaff1608b36aaee6
2012-02-24 17:01:59 -08:00
Adam Powell
b87148b2c0
Merge "Add support for optional titles in action modes"
2012-02-24 17:00:37 -08:00
Adam Powell
b98a81f86a
Add support for optional titles in action modes
...
Optional titles will only be displayed in the CAB if they entirely fit
instead of ellipsizing.
Fixes bug 5821883
Change-Id: I0cfd6d4fd34a4fa9f520499d577706da30606811
2012-02-24 16:59:03 -08:00
Romain Guy
325740fb44
Add hooks to implement Canvas.drawTextOnPath() in GL
...
Change-Id: I165c9e05facf5365aa6850605688e538640c7fcc
2012-02-24 16:48:34 -08:00
Mathias Agopian
f9c83f3763
Merge "remove libui dependency on libEGL"
2012-02-24 16:44:40 -08:00
Mathias Agopian
cc0eaa6582
remove libui dependency on libEGL
...
Change-Id: I1194f04085637d5c384e134967249430cc43b6ee
2012-02-24 16:42:46 -08:00
Dianne Hackborn
8657477721
am 44b1a43d: am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1
...
* commit '44b1a43d823ec3cb93e02df4834b27a75bb30ba5':
2012-02-24 16:42:14 -08:00
Dianne Hackborn
7e847390e8
Merge "resolved conflicts for merge of 34706a4c to master"
2012-02-24 16:39:59 -08:00
Dianne Hackborn
cb581bbe2e
resolved conflicts for merge of 34706a4c to master
...
Change-Id: I4dd24f3b917aa7e3d2c4b0fae51e951dfcf88ba8
2012-02-24 16:37:35 -08:00