62277 Commits

Author SHA1 Message Date
Glenn Kasten
cd498c3f2d Bug 5522189 re-enable ARM opts but disable inline
PIE did not work together with inlining.  This change combines (almost
all of) the performance benefits of ARM optimizations together with PIE.

Change-Id: I4594d33ae5a0a7bac327ae08e30fb35343a06256
2011-11-17 13:27:22 -08:00
Matthew Xie
1bce803f66 am 37fb92fb: am 302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1
* commit '37fb92fb634d10ca94731a73f2a60d86135baa6a':
  Call notifyIncomingA2dpConnection with correct rejected status
2011-11-17 07:48:29 -08:00
Mathias Agopian
280271d1f2 am f14ce7db: am 1125f89e: Merge "remove hack that hardcoded the refresh rate" into ics-mr1
* commit 'f14ce7db5dc327724984946e7754c777908cc2ad':
  remove hack that hardcoded the refresh rate
2011-11-17 07:48:27 -08:00
Mangesh Ghiware
163994c1d4 am 55116350: am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1
* commit '5511635090072ce02a4fb07ec25a7c279a7bbc8a':
  Revert change to setInitialScale() to take display density into account.
2011-11-17 07:48:24 -08:00
satok
8bc972a5a4 am 9e502e90: am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1
* commit '9e502e90b58b4d0bbb792ef1c40dcfd9b9322ce8':
  Clean up the spell checker framework
2011-11-17 07:48:17 -08:00
Daniel Sandler
28b23cdef4 am 8b9ba6fa: am f52a4482: Merge "Add a default Dreams component." into ics-mr1
* commit '8b9ba6fa8806c401c89df88f0a1690fbfd1ebb89':
  Add a default Dreams component.
2011-11-17 07:48:15 -08:00
Daniel Sandler
0505984abb am e11bcd1d: am 5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1
* commit 'e11bcd1d72cb45af984b9d457c4306f51923e853':
  Remove day of week from phone notification panel.
2011-11-17 07:48:12 -08:00
Mathias Agopian
905a12a949 am abdade71: am 69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1
* commit 'abdade71bc17153696fe2abe281c5a3b0c2e5abe':
  Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
2011-11-17 07:48:10 -08:00
Marco Nelissen
5a1623b379 am 3de68918: am e937da83: Merge "Change MediaController look b/5584613" into ics-mr1
* commit '3de689186531cebfabcb4b4d4163eae6baac528d':
  Change MediaController look b/5584613
2011-11-17 07:48:01 -08:00
Glenn Kasten
7418e385f4 Merge "MidiFile uses C++ Thread not createThreadEtc" 2011-11-17 07:14:41 -08:00
Glenn Kasten
b447e9ce1d Merge "JetPlayer uses C++ Thread not createThreadEtc" 2011-11-17 07:14:29 -08:00
Dianne Hackborn
77c5f4def4 am 9aa6bd1c: am 717a25dc: Add new ManagedEGLContext class to help apps participate in memory trimming.
* commit '9aa6bd1c34fe3583fe31f283a6415e84fec12567':
  Add new ManagedEGLContext class to help apps participate in memory trimming.
2011-11-17 05:46:34 -08:00
Dianne Hackborn
7cd2b19a92 am 65952ec4: am 4c6a65bc: Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1
* commit '65952ec4dc0e1703eb87a54c252953c53d07affc':
  Maybe fix issue #5627399: java.lang.RuntimeException - While sign in...
2011-11-17 05:46:32 -08:00
Robert Greenwalt
89d94e3550 am 795fcd07: am 33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1
* commit '795fcd07943ac1aaab309a4fa0d6bad1b67671a8':
  Fix TelephonyManager to grab the best context
2011-11-17 05:46:05 -08:00
Jamie Gennis
04dd4deafd am 7765fc65: am fd6b64f6: Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1
* commit '7765fc651a9519dd2f0ac9d3374a50e9865c5c99':
  SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
2011-11-17 05:46:00 -08:00
Eric Fischer
6c932dab1c am 02ed923d: (-s ours) am 7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '02ed923da995a10c537018861cfc149d04c66bc2':
  Import revised translations.  DO NOT MERGE
2011-11-17 05:45:54 -08:00
Gilles Debunne
664d87ef01 am b3272d29: am de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1
* commit 'b3272d297bb45e5cd3201766baef4fef7921ce05':
  IME action (done, next...) correctly handled
2011-11-17 05:45:29 -08:00
Kristian Monsen
ec2b01e788 Merge "Fix fix for bug 2816327" 2011-11-17 05:43:40 -08:00
Alex Sakhartchouk
e693fa3e18 am a962ef29: am 4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1
* commit 'a962ef2993099e6c5db3809a7e829e43c8cf084a':
  Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.
2011-11-17 04:08:30 -08:00
Fred Chung
d2789aa322 am d592714d: am 15fe377c: Merge "Bluetooth HDP sample." into ics-mr1
* commit 'd592714d9a48afce69d6904fc539f150b7c02898':
  Bluetooth HDP sample.
2011-11-17 04:08:28 -08:00
The Android Open Source Project
d949edddc0 am 4dce941e: am 816e68e2: No-op merge from ics-mr0
* commit '4dce941ecec71aa999cf777a43f05821793b6749':
2011-11-17 04:08:27 -08:00
Matthew Xie
37fb92fb63 am 302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1
* commit '302afb93d4fd908949ac796eda8343f9683e616a':
  Call notifyIncomingA2dpConnection with correct rejected status
2011-11-16 18:25:04 -08:00
Mathias Agopian
f14ce7db5d am 1125f89e: Merge "remove hack that hardcoded the refresh rate" into ics-mr1
* commit '1125f89e47b06b12a0e047d64f1ef953d0c48489':
  remove hack that hardcoded the refresh rate
2011-11-16 18:22:26 -08:00
Matthew Xie
302afb93d4 Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 2011-11-16 18:20:50 -08:00
Mathias Agopian
1125f89e47 Merge "remove hack that hardcoded the refresh rate" into ics-mr1 2011-11-16 18:19:33 -08:00
Mangesh Ghiware
5511635090 am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1
* commit '4fdfdeedc64eef2efe3811198e8fad40aa1b8fc3':
  Revert change to setInitialScale() to take display density into account.
2011-11-16 18:03:51 -08:00
Mangesh Ghiware
4fdfdeedc6 Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 2011-11-16 18:01:35 -08:00
Steven Ross
b076bfc5e3 Merge "Not showing facelock when plugging/unplugging fixes 5438524" 2011-11-16 17:46:44 -08:00
satok
9e502e90b5 am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1
* commit 'e5febfd5bd9b19a01383760b523476ba7f013a5c':
  Clean up the spell checker framework
2011-11-16 17:37:46 -08:00
satok
e5febfd5bd Merge "Clean up the spell checker framework" into ics-mr1 2011-11-16 17:35:54 -08:00
Daniel Sandler
8b9ba6fa88 am f52a4482: Merge "Add a default Dreams component." into ics-mr1
* commit 'f52a4482dd3ca336f84fc6c533ea4a99a72b23dd':
  Add a default Dreams component.
2011-11-16 17:16:54 -08:00
Matthew Xie
0901e601b5 Call notifyIncomingA2dpConnection with correct rejected status
notifyIncomingA2dpConnection was called with wrong rejected status.
Fix this.
bug 5626476

Change-Id: Ie8e4a8bdc6f6357a62172c86c21ee547376952a4
2011-11-16 17:14:36 -08:00
Daniel Sandler
e11bcd1d72 am 5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1
* commit '5311917df5fe9804105ff6070346b8fac4b102df':
  Remove day of week from phone notification panel.
2011-11-16 17:14:30 -08:00
Daniel Sandler
f52a4482dd Merge "Add a default Dreams component." into ics-mr1 2011-11-16 17:13:35 -08:00
Daniel Sandler
5311917df5 Merge "Remove day of week from phone notification panel." into ics-mr1 2011-11-16 17:13:16 -08:00
satok
060677f468 Clean up the spell checker framework
Change-Id: I64c0d813e53a4ebf8d7e63463e36f6900f1aa7d3
2011-11-17 09:40:56 +09:00
Mathias Agopian
abdade71bc am 69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1
* commit '69c17a11a2ce5badc238e66ce9f8ca4a3a1028b3':
  Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
2011-11-16 16:16:11 -08:00
Mathias Agopian
69c17a11a2 Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1 2011-11-16 16:13:38 -08:00
Mathias Agopian
db5494c406 Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
This reverts commit e7758be6da85728df6b4215f413660c67c5a9740.

Seemed to cause failures un SurfaceTexture.

Bug: 5627450
2011-11-16 15:59:13 -08:00
Glenn Kasten
376c393039 MidiFile uses C++ Thread not createThreadEtc
This permits leveraging future improvements to Thread.

Change-Id: I323b709e935c47fa3c6041cb8b82fda994e78b56
2011-11-16 15:43:31 -08:00
Glenn Kasten
9c0227a63c JetPlayer uses C++ Thread not createThreadEtc
This permits leveraging future improvements to Thread.

Change-Id: I60deed8565ed54f13d9f770c76504e411b154276
2011-11-16 15:25:30 -08:00
Glenn Kasten
3cce14e8ff Merge "Bug 4903178 Restore priority and cgroup on stop" 2011-11-16 15:11:20 -08:00
Marco Nelissen
3de6891865 am e937da83: Merge "Change MediaController look b/5584613" into ics-mr1
* commit 'e937da83143d67fbd709d37bd7418f9807e72baa':
  Change MediaController look b/5584613
2011-11-16 14:57:23 -08:00
Marco Nelissen
e937da8314 Merge "Change MediaController look b/5584613" into ics-mr1 2011-11-16 14:54:20 -08:00
Glenn Kasten
99d544332a Bug 4903178 Restore priority and cgroup on stop
On AudioTrack and AudioRecord stop or failed start, restore the priority
and cgroup of the caller to their previous values, rather than forcing
to NORMAL.  Dependent on new thread APIs.

Also fixes bug where priority was set to AUDIO but cgroup not set.

Change-Id: Ib83893918fb4fdf57c6b87884b51038997a631d8
2011-11-16 14:52:55 -08:00
Dianne Hackborn
9aa6bd1c34 am 717a25dc: Add new ManagedEGLContext class to help apps participate in memory trimming.
* commit '717a25dc2a411edb548859cd6870363346c71b01':
  Add new ManagedEGLContext class to help apps participate in memory trimming.
2011-11-16 14:37:54 -08:00
Dianne Hackborn
65952ec4dc am 4c6a65bc: Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1
* commit '4c6a65bc319feab120d40553d93b160908db2f6d':
  Maybe fix issue #5627399: java.lang.RuntimeException - While sign in...
2011-11-16 14:06:05 -08:00
Dianne Hackborn
717a25dc2a Add new ManagedEGLContext class to help apps participate in memory trimming.
This class provides an API for an application to know when it is time to
destroy its EGL context when memory is being trimmed.  By having this in
the framework, we can still detect whether it will be useful to destroy
any EGL contexts (because we know if doing so will destroy all of them).

Change-Id: I1eac8d640052778052926b875c7928008f752182
2011-11-16 14:04:53 -08:00
Dianne Hackborn
4c6a65bc31 Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1 2011-11-16 14:03:09 -08:00
Marco Nelissen
cbd4bcaa71 Change MediaController look
b/5584613

Change-Id: I6799753ffff3202e354039b85fdca72e48e6be5d
2011-11-16 13:43:11 -08:00