OSDN Git Service
Eric Fischer [Tue, 15 Nov 2011 19:55:54 +0000 (11:55 -0800)]
am
3524831a: am
8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
3524831a633693cf72880299706b2039d41c3b78':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Nov 2011 19:51:38 +0000 (11:51 -0800)]
am
8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
8d00c194c228e67851e5a0cb75c4bf4d99dd40f0':
Import revised translations. DO NOT MERGE
Tsu Chiang Chuang [Tue, 15 Nov 2011 19:13:45 +0000 (11:13 -0800)]
am
b3f2890a: am
047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0
* commit '
b3f2890a8af3a99be1b0d5fd5a40df656cb60598':
Adding mobile microbenchmark tests.
Tsu Chiang Chuang [Tue, 15 Nov 2011 19:10:44 +0000 (11:10 -0800)]
am
047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0
* commit '
047c4de2c548960fff428a92099003593cede5f8':
Adding mobile microbenchmark tests.
Gilles Debunne [Tue, 15 Nov 2011 18:02:15 +0000 (10:02 -0800)]
am
8a440477: Merge "Clean-up in TextView" into ics-mr1
* commit '
8a440477fd203d74b73b32dc2b357f07dfc36067':
Clean-up in TextView
Gilles Debunne [Tue, 15 Nov 2011 17:59:45 +0000 (09:59 -0800)]
Merge "Clean-up in TextView" into ics-mr1
John Reck [Tue, 15 Nov 2011 17:58:48 +0000 (09:58 -0800)]
am
a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1
* commit '
a0c6bf5af6af4b0fd59347b78d3a507c416a46e6':
Call onScrollChanged when scrolling layers
John Reck [Tue, 15 Nov 2011 17:56:17 +0000 (09:56 -0800)]
Merge "Call onScrollChanged when scrolling layers" into ics-mr1
Hong Teng [Tue, 15 Nov 2011 17:45:29 +0000 (09:45 -0800)]
am
481ffa50: Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
* commit '
481ffa505bb1d8f5089ea98e3b5960d409b6819c':
Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
Hong Teng [Tue, 15 Nov 2011 17:42:37 +0000 (09:42 -0800)]
Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
Daniel Sandler [Tue, 15 Nov 2011 17:22:40 +0000 (09:22 -0800)]
am
ce33622a: Merge "Bring back the \'more notifications\' icon." into ics-mr1
* commit '
ce33622aed7fb25a14ef957cdc78b78cc4602be9':
Bring back the 'more notifications' icon.
Daniel Sandler [Tue, 15 Nov 2011 17:20:56 +0000 (09:20 -0800)]
Merge "Bring back the 'more notifications' icon." into ics-mr1
Jean-Michel Trivi [Tue, 15 Nov 2011 16:58:55 +0000 (08:58 -0800)]
am
538dc6ac: Merge "Fix
5615747 Don\'t leak remote control client death handlers" into ics-mr1
* commit '
538dc6acfd14ea59f0b294531f9417ca04ca621f':
Fix
5615747 Don't leak remote control client death handlers
Jean-Michel Trivi [Tue, 15 Nov 2011 16:56:55 +0000 (08:56 -0800)]
Merge "Fix
5615747 Don't leak remote control client death handlers" into ics-mr1
Wu-cheng Li [Tue, 15 Nov 2011 14:16:21 +0000 (06:16 -0800)]
am
b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1
* commit '
b90a70d1542edd5a95e73b75192e6eb5a66401cc':
Improve camera face detection javadoc.
Wu-cheng Li [Tue, 15 Nov 2011 14:14:11 +0000 (06:14 -0800)]
Merge "Improve camera face detection javadoc." into ics-mr1
Wu-cheng Li [Fri, 12 Aug 2011 12:25:00 +0000 (20:25 +0800)]
Improve camera face detection javadoc.
bug:
4460717
Change-Id: I6e040911ce802e597e77dfdde1c92b75d51975c8
Michael Jurka [Tue, 15 Nov 2011 07:55:12 +0000 (23:55 -0800)]
am
4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1
* commit '
4b7494e07a44c0aa363379be463de70455a895f3':
Updating recent apps visuals on tablet
Michael Jurka [Tue, 15 Nov 2011 07:53:34 +0000 (23:53 -0800)]
Merge "Updating recent apps visuals on tablet" into ics-mr1
Michael Jurka [Sun, 13 Nov 2011 21:50:38 +0000 (13:50 -0800)]
Updating recent apps visuals on tablet
- getting rid of blue glow (
5529032)
- moving app icon position
- show message if there are no recent apps (
5533332)
- fixing rare IllegalStateException on orientation change (
5584344)
Change-Id: I2210e584957869c8f02339e6841daf39364a9dad
Jeff Sharkey [Tue, 15 Nov 2011 07:39:46 +0000 (23:39 -0800)]
am
d968670d: Merge "Conservatively trim data usage stats." into ics-mr1
* commit '
d968670d8369e5d92ba9b7a45b3804d692a05a4e':
Conservatively trim data usage stats.
Jeff Sharkey [Tue, 15 Nov 2011 07:37:17 +0000 (23:37 -0800)]
Merge "Conservatively trim data usage stats." into ics-mr1
Nick Pelly [Tue, 15 Nov 2011 04:16:07 +0000 (20:16 -0800)]
am
b3b66af2: Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1
* commit '
b3b66af2b5b4ccca1f507290ab6f138a3cbffc3e':
Move nfc-extras tests into frameworks/base/nfc-extras/tests.
Nick Pelly [Tue, 15 Nov 2011 04:14:11 +0000 (20:14 -0800)]
Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1
Jeff Sharkey [Tue, 15 Nov 2011 02:02:21 +0000 (18:02 -0800)]
Conservatively trim data usage stats.
Instead of trusting NTP time alone, use the most-conservative of
system clock and NTP.
Bug:
5584564
Change-Id: I5dd87fc009959b1cf0a7d660e385a0b1a8be238b
Adam Powell [Tue, 15 Nov 2011 03:49:39 +0000 (19:49 -0800)]
am
539bcca9: Merge "Fix bug
5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1
* commit '
539bcca99d00166303245cd8137f49f29ff3f08e':
Fix bug
5594320 - Overlay action bar decor layout causes two measure passes
Adam Powell [Tue, 15 Nov 2011 03:47:55 +0000 (19:47 -0800)]
Merge "Fix bug
5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1
Nick Pelly [Tue, 15 Nov 2011 03:40:46 +0000 (19:40 -0800)]
am
a26cf301: Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1
* commit '
a26cf3011157eb94fa2766e76fa0096628c16c18':
Enforce 1-1 relationship between context and NfcAdapterExtras.
Nick Pelly [Tue, 15 Nov 2011 03:39:09 +0000 (19:39 -0800)]
Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1
Dianne Hackborn [Tue, 15 Nov 2011 02:40:13 +0000 (18:40 -0800)]
am
91c2b5ce: Merge "Improve low memory reporting." into ics-mr1
* commit '
91c2b5cebe981fb894b7e6f053a8593c1d9db80f':
Improve low memory reporting.
Jeff Brown [Tue, 15 Nov 2011 02:37:47 +0000 (18:37 -0800)]
am
9058435d: Merge "Fix races when content providers are acquired and released." into ics-mr1
* commit '
9058435dc1a741030c042c4d6f2512f5d1605e5d':
Fix races when content providers are acquired and released.
Dianne Hackborn [Tue, 15 Nov 2011 02:37:46 +0000 (18:37 -0800)]
am
f10a5364: Merge "Maybe fix issue #
5405788: Device continuously opening and closing..." into ics-mr1
* commit '
f10a53646044da31e73f5393d929c603871d4a28':
Maybe fix issue #
5405788: Device continuously opening and closing...
Dianne Hackborn [Tue, 15 Nov 2011 02:36:50 +0000 (18:36 -0800)]
Merge "Improve low memory reporting." into ics-mr1
Jeff Brown [Tue, 15 Nov 2011 02:35:57 +0000 (18:35 -0800)]
Merge "Fix races when content providers are acquired and released." into ics-mr1
Dianne Hackborn [Tue, 15 Nov 2011 02:35:46 +0000 (18:35 -0800)]
Merge "Maybe fix issue #
5405788: Device continuously opening and closing..." into ics-mr1
Jeff Brown [Sat, 12 Nov 2011 04:16:14 +0000 (20:16 -0800)]
Fix races when content providers are acquired and released.
This change fixes race conditions that occur very regularly when
content providers are accessed from multiple threads at the same
time.
When a content provider is not already in the application's cache,
the application needs to ask the ActivityManager to obtain it.
Meanwhile, another thread can come along and do the same thing.
This can cause problems because the application attempts to
install two copies of the provider and the reference counts
and other bookkeeping can get muddled.
Similarly, there are races between releasing the last reference
to a content provider and acquiring the content provider. It's
possible for one thread to snatch the content provider from the
jaws of death. We need to handle this explicitly to ensure that
the content provider does not accidentally get released right
after it was acquired by the other thread.
This change ensures that the reference count bookkeeping and
provider map are maintained in parallel while holding the same lock.
Previously because the lock was dropped and reacquired in the
middle of acquisition and removal, it was possible for a
content provider with a zero reference count to be returned
to the application. Likewise, it was possible for a content
provider with a non-zero reference count to be disposed!
This change also performs compensatory actions when races are
detected to ensure that the necessary invariants are maintained
throughout. In particular, it ensures that the application
drops a duplicate reference to a content provider when no
longer needed.
Another way to solve this problem would be to explicitly prevent
the races from happening in the first place by maintaining a
table of content providers that are in the process of being
acquired. The first thread to attempt to acquire the provider
would store a record. The next thread would find the record
and block until the first thread was finished. I chose not
to implement the code in that manner because we would still
have needed to perform compensatory actions in the case where
the same provider binder has multiple logical names. Also,
it could cause deadlocks if the attempt to acquire
a content provider were re-entrant for some bizarre reason.
Bug:
5547357
Change-Id: I2ad39a8acc30aaf7ae5354decd0a0a41e9b9c3da
Dianne Hackborn [Tue, 15 Nov 2011 02:27:24 +0000 (18:27 -0800)]
Improve low memory reporting.
Change-Id: I42d56ab8026fd02232dd11dbfbc513fbc0a1a851
Daisuke Miyakawa [Tue, 15 Nov 2011 01:56:47 +0000 (17:56 -0800)]
am
d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1
* commit '
d8f5e6badb0dc11055508b83f20e48c82a7058bd':
Allow ContactsProvider to remove dulicates
Daisuke Miyakawa [Tue, 15 Nov 2011 01:54:17 +0000 (17:54 -0800)]
Merge "Allow ContactsProvider to remove dulicates" into ics-mr1
Dianne Hackborn [Tue, 15 Nov 2011 01:45:19 +0000 (17:45 -0800)]
Maybe fix issue #
5405788: Device continuously opening and closing...
...the "Complete action using" dialog
I have never been able to reproduce this consistently, but here is
another stab in the twilight. It looks like during boot we have
a potential race where we could reset the config sequence number after
we had gone through a config change, causing ActivityThread to ignore
a following config change. Maybe this change will help.
Change-Id: I4b731df5fd5c63894ca2e9bd34693b31ab1c0565
Jamie Gennis [Tue, 15 Nov 2011 01:41:20 +0000 (17:41 -0800)]
am
6b228af6: Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1
* commit '
6b228af6ff20b3f592db4ad5662e1bc401d09b4d':
EGL: add the ANDROID suffix to the blob cache ext
Jamie Gennis [Tue, 15 Nov 2011 01:36:46 +0000 (17:36 -0800)]
Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1
Jean-Michel Trivi [Mon, 14 Nov 2011 23:23:04 +0000 (15:23 -0800)]
Fix
5615747 Don't leak remote control client death handlers
Whenever a remote control stack entry is GC'd or removed from
the stack, unlink its death handler.
Change-Id: Ia4ed6667351849fd388272591e24ffc16959beaf
John Reck [Wed, 2 Nov 2011 17:18:12 +0000 (10:18 -0700)]
Call onScrollChanged when scrolling layers
Bug:
5533389
Treat layer scrolling as a no-op scroll by calling
onScrollChanged with old scroll == new scroll
Change-Id: I1dc2b94b37c65bf088806b8d28be32883e3b8bee
Jim Miller [Tue, 15 Nov 2011 00:16:28 +0000 (16:16 -0800)]
am
ff95f657: Merge "Fix
5579440: Add transport control view to tablet unlock screens" into ics-mr1
* commit '
ff95f6572596c48b58f5a73d23b2273866ea3fab':
Fix
5579440: Add transport control view to tablet unlock screens
Jim Miller [Tue, 15 Nov 2011 00:14:07 +0000 (16:14 -0800)]
Merge "Fix
5579440: Add transport control view to tablet unlock screens" into ics-mr1
Adam Powell [Mon, 14 Nov 2011 23:32:32 +0000 (15:32 -0800)]
Fix bug
5594320 - Overlay action bar decor layout causes two measure passes
The existing action bar overlay decor layouts hit a case in
RelativeLayout that causes two measure passes for the main content. As
this can be expensive, stick the bar and the content overlay into
their own sub-layout and switch things to use a FrameLayout at the top
level instead.
Be explicit about the layout_width/height on ActionBar-containing
decor layouts as the older decor layouts are.
Change-Id: I4330f0f25841dd8058b94a320f93bf67fb56bf17
Nick Pelly [Mon, 14 Nov 2011 22:21:57 +0000 (14:21 -0800)]
Move nfc-extras tests into frameworks/base/nfc-extras/tests.
The new NFC Extras access control allows us to run these tests
without a vendor specific certificate.
Change-Id: I9425e08e557214cf6a74276622402c5682bbaef4
Eric Fischer [Mon, 14 Nov 2011 23:06:30 +0000 (15:06 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Tsu Chiang Chuang [Mon, 14 Nov 2011 23:03:17 +0000 (15:03 -0800)]
Merge "Adding mobile microbenchmark tests." into ics-mr0
Tsu Chiang Chuang [Mon, 14 Nov 2011 22:38:31 +0000 (14:38 -0800)]
am
6a54a997: Merge "Adding mobile microbenchmark tests." into ics-mr1
* commit '
6a54a997e3dc71c5b9c5a1c7829bc3eb35404e92':
Adding mobile microbenchmark tests.
Adam Cohen [Mon, 14 Nov 2011 22:35:57 +0000 (14:35 -0800)]
am
6066a2b4: Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue
5613241)" into ics-mr1
* commit '
6066a2b4de36549b7d8fe36507b7254e501f0b28':
Fix uncaught exception in WindowManager#setWallpaperOffsets (issue
5613241)
Tsu Chiang Chuang [Mon, 14 Nov 2011 22:35:42 +0000 (14:35 -0800)]
Merge "Adding mobile microbenchmark tests." into ics-mr1
Adam Cohen [Mon, 14 Nov 2011 22:33:06 +0000 (14:33 -0800)]
Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue
5613241)" into ics-mr1
Nick Pelly [Mon, 14 Nov 2011 22:22:52 +0000 (14:22 -0800)]
Enforce 1-1 relationship between context and NfcAdapterExtras.
This fixes a bug where NfcExecutionEnvironment.close() would NPE
if you called it on a different EE to the one you opened. We now
always return the same EE in the same contet.
Change-Id: I949998dc2ee738527ee281cae46ae50ea6950a2c
Jim Miller [Wed, 9 Nov 2011 03:50:49 +0000 (19:50 -0800)]
Fix
5579440: Add transport control view to tablet unlock screens
This updated tablet layouts to support showing album art and transport
control views in PIN, pattern and password screens of lock screen.
It also allows the addition of a background protect asset and
the ability to show the system wallpaper on layouts that define a
transport_bg_protect view.
Also updated layout to use new ICS-style buttons on lock screen and
fixed bug with "forgot pattern" button where we were showing the
emergency call icon.
To avoid problems with leading ones in the mono-space clock font,
we now right-justify status text on tablet and remove the AM/PM
indicator.
Status font size adjusted by UX.
Added background protection drop shadow to transport control.
Fixed portrait mode to be right-justified when transport is showing.
Change-Id: I790292fc39f4588f87adc9d9241706817ae6baab
Adam Cohen [Mon, 14 Nov 2011 21:28:50 +0000 (13:28 -0800)]
Fix uncaught exception in WindowManager#setWallpaperOffsets (issue
5613241)
Change-Id: I4646095f4cde9514425be8ab2dbf805d9788aa5c
Eric Fischer [Mon, 14 Nov 2011 21:24:28 +0000 (13:24 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I287b6b70df6795513fc1fc98d2fddaf310042e98
Daisuke Miyakawa [Mon, 14 Nov 2011 21:16:07 +0000 (13:16 -0800)]
Allow ContactsProvider to remove dulicates
Bug:
5484956
Change-Id: Ie88af0c3d21919ca201f4fcdd46ca09e9f8d94c0
Hong Teng [Thu, 10 Nov 2011 22:54:26 +0000 (14:54 -0800)]
Fix for issue
5309336
-add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
Change-Id: I41ffbc192fcce4c7635e5b0a1f2835852e5ee509
Jean-Michel Trivi [Mon, 14 Nov 2011 20:33:20 +0000 (12:33 -0800)]
am
258576a8: Merge "Fix
5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1
* commit '
258576a82c2293c3a988bf2dc6744fd8082421f9':
Fix
5607938 AudioFocusDeathHandler leaks GREF
Jean-Michel Trivi [Mon, 14 Nov 2011 20:31:10 +0000 (12:31 -0800)]
Merge "Fix
5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1
Dave Burke [Mon, 14 Nov 2011 20:27:34 +0000 (12:27 -0800)]
am
9d66da8a: Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1
* commit '
9d66da8ae61a8520f46ee7df3cbb374852d9da91':
Revert "Discard framebuffer rendering queues when discarding layers"
Dave Burke [Mon, 14 Nov 2011 20:25:53 +0000 (12:25 -0800)]
Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1
John Wang [Mon, 14 Nov 2011 20:11:35 +0000 (12:11 -0800)]
am
72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1
* commit '
72a31ab98f8687aa48fce028d54e79929780a302':
[maguro] Fix STK issues
John Wang [Mon, 14 Nov 2011 20:10:16 +0000 (12:10 -0800)]
Merge "[maguro] Fix STK issues" into ics-mr1
Mathias Agopian [Mon, 14 Nov 2011 19:51:48 +0000 (11:51 -0800)]
am
c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1
* commit '
c93a151fde7d616c22b86ae458b3d015e3820d5e':
Define, document, and test the behavior of very large SurfaceTextures
Mathias Agopian [Mon, 14 Nov 2011 19:49:42 +0000 (11:49 -0800)]
Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1
Dave Burke [Mon, 14 Nov 2011 19:39:30 +0000 (11:39 -0800)]
Revert "Discard framebuffer rendering queues when discarding layers"
This reverts commit
da96f8ac2c1c35a54f3f36e6d776cb386a251d03.
dujin.cha [Sat, 12 Nov 2011 08:50:26 +0000 (17:50 +0900)]
[maguro] Fix STK issues
1. Fix Bug
5574160 (Abnormal Setup menu)
2. Fix Bug
5558273 (GetInkey issue)
3. Fix BUg
5558612 (No default alpha id)
4. Fix Vodafone UK ALS issue.
Bug :
5574160,
5558273,
5558612
Change-Id: Ief74d0e4f4f28dff7a435e9dab1fab1ca1d9bfaf
Signed-off-by: dujin.cha <dujin.cha@samsung.com>
Alex Sakhartchouk [Mon, 14 Nov 2011 18:37:21 +0000 (10:37 -0800)]
am
cde433c5: Merge "Fixing a race condition in RSSurfaceView. Bug
5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context." into ics-mr1
* commit '
cde433c5f75fd4ac2ab31e9fc34654750d1e83f8':
Fixing a race condition in RSSurfaceView. Bug
5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context.
Alex Sakhartchouk [Mon, 14 Nov 2011 18:35:08 +0000 (10:35 -0800)]
Merge "Fixing a race condition in RSSurfaceView. Bug
5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context." into ics-mr1
Eric Laurent [Mon, 14 Nov 2011 16:39:33 +0000 (08:39 -0800)]
am
030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
* commit '
030bb99814157b6424c0bf290bd2ede217b5ba77':
audioflinger: fix noise when skipping to next song
Eric Laurent [Mon, 14 Nov 2011 16:38:05 +0000 (08:38 -0800)]
Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
Mathias Agopian [Mon, 14 Nov 2011 15:46:03 +0000 (07:46 -0800)]
am
28587497: Merge "Discard framebuffer rendering queues when discarding layers Bug #
5581817" into ics-mr1
* commit '
2858749704ea7b130499cf2ac7b3e1c3331f1582':
Discard framebuffer rendering queues when discarding layers Bug #
5581817
Scott Main [Mon, 14 Nov 2011 15:46:03 +0000 (07:46 -0800)]
am
2af9f21c: am
19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
* commit '
2af9f21c664d4579b5f51283a320a7d1fba13a75':
Jeff Brown [Mon, 14 Nov 2011 15:46:02 +0000 (07:46 -0800)]
am
6f0464e7: am
f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit '
6f0464e79d6d41d8255a6b0b6695fa7f67a0f65f':
Adam Powell [Mon, 14 Nov 2011 15:46:01 +0000 (07:46 -0800)]
am
771d0c99: am
6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0
* commit '
771d0c99f6433c3ad7063cdfa847c9476ef0453c':
Robert Ly [Mon, 14 Nov 2011 15:46:01 +0000 (07:46 -0800)]
Robert Ly [Mon, 14 Nov 2011 15:46:00 +0000 (07:46 -0800)]
am
83c16e25: am
5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '
83c16e2577705b577d2c74d45b0e55a50a0806e2':
Adam Powell [Mon, 14 Nov 2011 15:46:00 +0000 (07:46 -0800)]
am
a8743f15: Fix bug
5425280 - Two ActionBar icons show up
* commit '
a8743f152aac4a8ef97c79bdad5232614453ce2a':
Fix bug
5425280 - Two ActionBar icons show up
Mathias Agopian [Mon, 14 Nov 2011 08:52:09 +0000 (00:52 -0800)]
Merge "Discard framebuffer rendering queues when discarding layers Bug #
5581817" into ics-mr1
Scott Main [Sat, 12 Nov 2011 04:34:51 +0000 (20:34 -0800)]
am
19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
* commit '
19b1c12b5eb3417e9f56810cc08ee1e560da0a99':
Docs: update state list drawable with state_activated and revise selected/focused
Jeff Brown [Sat, 12 Nov 2011 04:34:48 +0000 (20:34 -0800)]
am
f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit '
f1f0c873b1d119a19342cb67ca77b59607951659':
Fix bug in TextLayoutCacheKey handling embedded nulls.
Adam Powell [Sat, 12 Nov 2011 04:34:45 +0000 (20:34 -0800)]
am
6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0
* commit '
6200a4b7eb07507055af93ec1a054640a39b9751':
DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an overflow menu under invalid circumstances.
Robert Ly [Sat, 12 Nov 2011 04:34:43 +0000 (20:34 -0800)]
Robert Ly [Sat, 12 Nov 2011 04:34:39 +0000 (20:34 -0800)]
am
5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '
5ad6f646fbe692b94961df6472bec2b8bd1ea382':
docs: ndk r7 rel notes
Scott Main [Sat, 12 Nov 2011 03:22:07 +0000 (19:22 -0800)]
am
19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
* commit '
19b1c12b5eb3417e9f56810cc08ee1e560da0a99':
Docs: update state list drawable with state_activated and revise selected/focused
Jeff Brown [Sat, 12 Nov 2011 03:22:04 +0000 (19:22 -0800)]
am
f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit '
f1f0c873b1d119a19342cb67ca77b59607951659':
Fix bug in TextLayoutCacheKey handling embedded nulls.
Adam Powell [Sat, 12 Nov 2011 03:22:02 +0000 (19:22 -0800)]
am
6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0
* commit '
6200a4b7eb07507055af93ec1a054640a39b9751':
DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an overflow menu under invalid circumstances.
Robert Ly [Sat, 12 Nov 2011 03:22:01 +0000 (19:22 -0800)]
Robert Ly [Sat, 12 Nov 2011 03:17:23 +0000 (19:17 -0800)]
am
5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '
5ad6f646fbe692b94961df6472bec2b8bd1ea382':
docs: ndk r7 rel notes
Mathias Agopian [Thu, 10 Nov 2011 22:34:26 +0000 (14:34 -0800)]
Define, document, and test the behavior of very large SurfaceTextures
updateTexImage() now throws a runtime exception when its native
counterpart fails
Bug:
5506633
Change-Id: I151a6f685d465966e7df4df624412ab2da62e95f
Adam Powell [Sat, 12 Nov 2011 02:35:53 +0000 (18:35 -0800)]
Fix bug
5425280 - Two ActionBar icons show up
Change-Id: Ic82f8ce648f9314a0800eeff326df7d8dfe5027b
Scott Main [Sat, 12 Nov 2011 01:17:23 +0000 (17:17 -0800)]
Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
Eric Laurent [Fri, 11 Nov 2011 23:42:52 +0000 (15:42 -0800)]
audioflinger: fix noise when skipping to next song
When audio effects are enabled, a noise can be heard at the
beginning of the new song when skipping to next song in music app.
This is because some effects (especially virtualizer) have a tail.
This tail was not played when previous song was stopped because effects were
not processed when no tracks were present on a given session. This is to
reduce CPU load when effects are enabled but no audio is playing.
The tail was then rendered when the new song was started.
Added a delay before stopping effect process after all tracks have been removed from a session.
Issue
5584880.
Change-Id: I815e0f7441f9302e8dfe413dc269a94e4cc6fd95
Christopher Tate [Sat, 12 Nov 2011 00:21:28 +0000 (16:21 -0800)]
am
c51bb4d3: Merge "XML parsing optimizations" into ics-mr1
* commit '
c51bb4d394dd47e48abc8a6d9cbc740f821546ff':
XML parsing optimizations
Christopher Tate [Sat, 12 Nov 2011 00:19:29 +0000 (16:19 -0800)]
Merge "XML parsing optimizations" into ics-mr1
Jean-Michel Trivi [Sat, 12 Nov 2011 00:13:48 +0000 (16:13 -0800)]
Fix
5607938 AudioFocusDeathHandler leaks GREF
The AudioFocus death handler was correctly updating the audio
focus stack when an audio focus client dies, but the death handler
was leaking GREF if unlinkToDeath() is not called.
The fix consists in making sure unlinkToDeath() is always called
by calling it in its finalizer.
Change-Id: I0c5343b4986ab582cadbf171fc53816952dc16f5
Dianne Hackborn [Sat, 12 Nov 2011 00:13:46 +0000 (16:13 -0800)]
am
be70785f: Make activity manager more robust in the face of app activity leaks.
* commit '
be70785f9b2dbd2c52fd8676d99bc64b22784201':
Make activity manager more robust in the face of app activity leaks.