68445 Commits

Author SHA1 Message Date
James Dong
e512ad5089 Merge "Deprecate default constructor for classes that should have been meant to be interfaces" 2012-02-28 14:33:19 -08:00
Eric Fischer
6fa13b5a02 Merge "Import translations. DO NOT MERGE" 2012-02-28 13:56:29 -08:00
Eric Fischer
cb4c17d27a Merge "Import translations. DO NOT MERGE" 2012-02-28 13:55:24 -08:00
Jeff Sharkey
c81ec3637b Merge "Suppress StrictMode in handleBindApplication()." 2012-02-28 13:21:04 -08:00
James Dong
31db8b9f6b Merge "Remove unnecessary header file includes for drmserver" 2012-02-28 13:09:44 -08:00
James Dong
da5ac93b00 Merge "Added missing javadoc comment for public API in DrmUtils class" 2012-02-28 13:09:24 -08:00
Ying Wang
04a3a4350e Disable ProGuard for FakeOemFeatures to fix build.
Change-Id: If0ccf16712bf43adb5fe490906be2a13b484f726
2012-02-28 12:53:19 -08:00
Eric Fischer
18634b34e6 Import translations. DO NOT MERGE
Change-Id: I2761d2e7bb8795ab23a0024ed41ec299abc400e1
2012-02-28 12:23:51 -08:00
Eric Fischer
604a7d4e26 Import translations. DO NOT MERGE
Change-Id: If4aaaf59012a1e6b799e3020a98f6f71117d5895
2012-02-28 12:13:13 -08:00
Jeff Sharkey
7c5016787e Suppress StrictMode in handleBindApplication().
Allow disk access during application and provider setup.  This could
block processing ordered broadcasts, but later processing would
probably end up doing the same disk access.

Bug: 6083825
Change-Id: I80f383063cedba2b099c78465134faa811e898d8
2012-02-28 12:11:29 -08:00
Jason Noguchi
2437a4ab02 am bb189574: am eac4b187: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit 'bb189574614d1ce8f9d61e58b7aebbd18f0d6c25':
2012-02-28 11:57:39 -08:00
Jason Noguchi
eb5698a6b9 am a1de5e48: am 743aceec: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit 'a1de5e48125797b5a6fcc43b68ddfd3d9d831e87':
  Adding time lapse test to mediaframework stress suite.
2012-02-28 11:55:13 -08:00
Jason Noguchi
bb18957461 am eac4b187: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit 'eac4b187d357eac61475c4dc6f673656e08e75a9':
2012-02-28 11:53:49 -08:00
Jason Noguchi
a1de5e4812 am 743aceec: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '743aceec4289508a8c514dae7319659cf7f278c4':
  Adding time lapse test to mediaframework stress suite.
2012-02-28 11:52:56 -08:00
Jason Noguchi
743aceec42 am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
  Adding time lapse test to mediaframework stress suite.
2012-02-28 11:50:14 -08:00
Jason Noguchi
eac4b187d3 am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
  Adding time lapse test to mediaframework stress suite.
2012-02-28 11:49:30 -08:00
Jason Noguchi
ee32993095 Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 2012-02-28 11:47:46 -08:00
John Reck
42fb45588f Merge "Fix cursorRingBounds NPE" 2012-02-28 11:40:00 -08:00
John Reck
c2baeffe00 Merge "Fix NPE" 2012-02-28 11:38:56 -08:00
John Reck
5528d7ccd1 Fix cursorRingBounds NPE
Bug: 6083657

Change-Id: I0aa30bc1df266b2f74b0fedfb635b71d63638fdb
2012-02-28 11:29:29 -08:00
Dianne Hackborn
ef437848ca Merge "You could think of this as what an OEM might do." 2012-02-28 11:26:02 -08:00
James Dong
8fe9260bbb Merge "Deprecated a mis-spelled method and replaced it with a new method" 2012-02-28 11:23:26 -08:00
John Reck
79d99bebc1 Fix NPE
Bug: 6083360

Change-Id: I8d4a4cfb4ca0bbefd848a6ed7a628bc3838e4f91
2012-02-28 11:21:17 -08:00
Android Git Automerger
af2abf5ada am a66926ff: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit 'a66926ff7fac7ef77da1b5f3f1a1dd9dd8d6b960':
2012-02-28 10:51:35 -08:00
Svetoslav Ganov
0631ac93f6 am 8f4582a2: am c78f1217: am a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '8f4582a278d3f93450f2a72ad6f6dc872668efb9':
2012-02-28 10:51:32 -08:00
Android Git Automerger
a66926ff7f Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-02-28 10:49:07 -08:00
Svetoslav Ganov
69db4df487 am 0c96daa5: am 0c7ffac4: am a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '0c96daa5d5a1ef778ad1ef4619ef1fa4c30519c6':
  NumberPicker showing IME when its input field  gains focus.
2012-02-28 10:41:42 -08:00
Svetoslav Ganov
8f4582a278 am c78f1217: am a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit 'c78f121716ff7d4cbf8a70519a266ae030942751':
  NumberPicker showing IME when its input field  gains focus.
2012-02-28 10:39:17 -08:00
Svetoslav Ganov
0c96daa5d5 am 0c7ffac4: am a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '0c7ffac4caf413bd5fef2002079ec1d4bff2bc37':
  NumberPicker showing IME when its input field  gains focus.
2012-02-28 10:38:39 -08:00
Svetoslav Ganov
0c7ffac4ca am a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit 'a2b41b438d45570867e4682c0caaf93ace5e712e':
  NumberPicker showing IME when its input field  gains focus.
2012-02-28 10:35:43 -08:00
Svetoslav Ganov
c78f121716 am a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit 'a2b41b438d45570867e4682c0caaf93ace5e712e':
  NumberPicker showing IME when its input field  gains focus.
2012-02-28 10:35:18 -08:00
Glenn Kasten
f64dfccd96 Merge "Unlock effect chains in the middle of two if's" 2012-02-28 07:23:42 -08:00
Glenn Kasten
c2dc1c4e57 Merge "Simplify removeNotificationClient" 2012-02-28 07:21:51 -08:00
Glenn Kasten
eb70fe50dd Merge "AudioFlinger const methods and parameters" 2012-02-28 07:21:09 -08:00
Jean-Baptiste Queru
9bb891faf4 am 254cf597: am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
* commit '254cf5973ebe5ebdce9ef261d826e88ed2f67f58':
  stagefright amr: Avoid C++/C99 for loops with variable declaration
2012-02-28 07:19:40 -08:00
Jean-Baptiste Queru
d92a683fb9 am d107453d: (-s ours) am 84dd87d9: am 015a248e: am 93df415c: Merge "Add stubs for better compatibility"
* commit 'd107453ddf3af507e015ac641d5fb67ed513cd4b':
  Add stubs for better compatibility
2012-02-28 07:19:36 -08:00
Glenn Kasten
0d07b6a55f Merge "Fix theoretical race condition in addOutputTrack" 2012-02-28 07:18:27 -08:00
Glenn Kasten
2b119a6336 Merge "AudioBufferProvider comments and cleanup" 2012-02-28 07:17:47 -08:00
James Dong
f7a68fc985 Added missing javadoc comment for public API in DrmUtils class
o also fixed mis-spelled private method name (quiteDispose => quietlyDispose)

Change-Id: I692cd7471eac547b849dd53853f60843b3915750
2012-02-27 22:46:02 -08:00
James Dong
a3a9d6e746 Remove unnecessary header file includes for drmserver
Change-Id: I14033861e74d20f9d4897b651c4eeee126d4d610
2012-02-27 22:26:48 -08:00
Mathias Agopian
aac99487a1 Merge "a window could get stuck to gpu composition" 2012-02-27 19:48:36 -08:00
Mathias Agopian
3169e4bd15 Merge "move CursorWindow from libbinder to libandroidfw" 2012-02-27 19:48:21 -08:00
Dianne Hackborn
d459f4bbfc You could think of this as what an OEM might do.
Except it does nothing.

But eat resources.

Yum, yum!

Current we create five processes.  The main process sucks up 16MB of
RAM and creates a full-screen window; only on high-end devices does
the window (and process) use the GPU.

The second through fourth processes just sits there not really doing
anything except using process overhead.

The fifth process runs a background service, slowing eating RAM until
it gets killed by the system (as the system will ultimately do with
background services).  It also creates a full-screen window, and always
uses the GPU even on low-end devices.

Change-Id: Ibe9e25f7dbd889f4dc83eed6a3c09b9b0437b4e3
2012-02-27 18:46:29 -08:00
James Dong
c4a9976aa1 Deprecated a mis-spelled method and replaced it with a new method
Change-Id: Id049a4effab120c3f837cde60a87efcd89a64ec6
2012-02-27 18:25:31 -08:00
Mathias Agopian
49d2b1864c move CursorWindow from libbinder to libandroidfw
Change-Id: I3b304e4f74e0d0ec8b20c57296c62449c9a0f792
2012-02-27 18:11:20 -08:00
Jeff Sharkey
6f9d697d83 Merge "Move NetworkStatsFactory to faster ProcFileReader." 2012-02-27 18:09:29 -08:00
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
Jamie Gennis
ed6c6575a9 Merge "Add tracing to various graphics components." 2012-02-27 18:06:39 -08:00
James Dong
060526f985 Deprecate default constructor for classes that should have been meant to be interfaces
o We should have not exposed these default constructors in the first place.

Change-Id: Ia8bcfe77e9730021ad8870ece67c6d0eed8146ad
2012-02-27 18:00:12 -08:00
Jamie Gennis
a85ca37c84 Add tracing to various graphics components.
This change adds ATRACE call tracing to BufferQueue,
SurfaceTextureClient, SurfaceTexture, SurfaceFlinger, Layer, and EGL.

Change-Id: I9d75ed26f5a3f0d1af635da38289520134cfbbb7
2012-02-27 17:50:35 -08:00