Commit Graph

27900 Commits

Author SHA1 Message Date
Wu-cheng Li
7c4dee75b8 am 4e1fed76: am b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1
* commit '4e1fed76c19cc9656af55e57dc57979324322593':
  Improve camera face detection javadoc.
2011-11-15 13:06:51 -08:00
Jeff Brown
a4db1b7278 am 642de92b: am 9058435d: Merge "Fix races when content providers are acquired and released." into ics-mr1
* commit '642de92b3500446ab2d2a84fbe4ff9c083e8c1af':
  Fix races when content providers are acquired and released.
2011-11-15 11:29:59 -08:00
Daisuke Miyakawa
2b6517cd2c am f2213aca: am d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1
* commit 'f2213acaae5073ea3b4f3f566f0e8c7dc976765b':
  Allow ContactsProvider to remove dulicates
2011-11-15 11:29:51 -08:00
Gilles Debunne
8d0d468fd2 am 8a440477: Merge "Clean-up in TextView" into ics-mr1
* commit '8a440477fd203d74b73b32dc2b357f07dfc36067':
  Clean-up in TextView
2011-11-15 10:01:21 -08:00
Gilles Debunne
8a440477fd Merge "Clean-up in TextView" into ics-mr1 2011-11-15 09:59:45 -08:00
John Reck
46fc72eb9d am a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1
* commit 'a0c6bf5af6af4b0fd59347b78d3a507c416a46e6':
  Call onScrollChanged when scrolling layers
2011-11-15 09:58:49 -08:00
Mike Lockwood
cfbcd3bf21 AudioManager: Add support for master mute
Change-Id: I98e87d1e266e0523c4aacb23cc5c4b3fdc7a1eac
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-11-15 09:57:33 -08:00
John Reck
a0c6bf5af6 Merge "Call onScrollChanged when scrolling layers" into ics-mr1 2011-11-15 09:56:17 -08:00
Wu-cheng Li
5975fe1e17 am b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1
* commit 'b90a70d1542edd5a95e73b75192e6eb5a66401cc':
  Improve camera face detection javadoc.
2011-11-15 09:25:57 -08:00
Jeff Brown
14684154b1 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.
2011-11-15 09:25:18 -08:00
Wu-cheng Li
b90a70d154 Merge "Improve camera face detection javadoc." into ics-mr1 2011-11-15 06:14:11 -08:00
Wu-cheng Li
8c13670c13 Improve camera face detection javadoc.
bug:4460717
Change-Id: I6e040911ce802e597e77dfdde1c92b75d51975c8
2011-11-15 17:55:37 +08:00
Jeff Brown
ddaa9ac896 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
2011-11-14 18:31:13 -08:00
Daisuke Miyakawa
96c73c18ed am d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1
* commit 'd8f5e6badb0dc11055508b83f20e48c82a7058bd':
  Allow ContactsProvider to remove dulicates
2011-11-14 17:56:41 -08:00
Daisuke Miyakawa
d8f5e6badb Merge "Allow ContactsProvider to remove dulicates" into ics-mr1 2011-11-14 17:54:17 -08:00
Jim Miller
6162960c1e am 3dd55677: am ff95f657: Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1
* commit '3dd5567710168da330741cb4c4263cc03dd942f1':
  Fix 5579440: Add transport control view to tablet unlock screens
2011-11-14 16:21:10 -08:00
John Reck
83b9e1d99d 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
2011-11-14 16:17:54 -08:00
Jim Miller
00a4ac1d43 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
2011-11-14 16:16:41 -08:00
Jim Miller
ff95f65725 Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1 2011-11-14 16:14:07 -08:00
Adam Cohen
e23a588eb5 am 621f9716: am 6066a2b4: Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)" into ics-mr1
* commit '621f971691e3e819ddcd95898f4f93498e00c2ad':
  Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)
2011-11-14 14:38:30 -08:00
Adam Cohen
8222bbf39c am 6066a2b4: Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)" into ics-mr1
* commit '6066a2b4de36549b7d8fe36507b7254e501f0b28':
  Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)
2011-11-14 14:36:11 -08:00
Adam Cohen
6066a2b4de Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)" into ics-mr1 2011-11-14 14:33:06 -08:00
Jim Miller
faed16030d 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
2011-11-14 14:09:05 -08:00
Danielle Millett
0cdbc3d6ad DO NOT MERGE cherry picking from MR0 cl 148223
Showing a congratulations screen after choosing face unlock backup lock

Once a backup lock has been chosen, it sends an intent to show a
congratulations screen.  The moveTempGallery function has been moved
inside this new activity so it is no longer needed in LockPatternUtils.

Change-Id: I66868e6e3391b8b740f618fe633047ce388f55ca
2011-11-14 16:42:31 -05:00
Adam Cohen
8e2e572224 Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)
Change-Id: I4646095f4cde9514425be8ab2dbf805d9788aa5c
2011-11-14 13:28:50 -08:00
Daisuke Miyakawa
19352e0852 Allow ContactsProvider to remove dulicates
Bug: 5484956
Change-Id: Ie88af0c3d21919ca201f4fcdd46ca09e9f8d94c0
2011-11-14 13:16:07 -08:00
Dave Burke
28a5ec9613 am 2cfb873c: am 9d66da8a: Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1
* commit '2cfb873c9f0b56f2c7d694a21c968511223933af':
  Revert "Discard framebuffer rendering queues when discarding layers"
2011-11-14 12:30:04 -08:00
Dave Burke
3d151e1966 am 9d66da8a: Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1
* commit '9d66da8ae61a8520f46ee7df3cbb374852d9da91':
  Revert "Discard framebuffer rendering queues when discarding layers"
2011-11-14 12:28:09 -08:00
Dave Burke
7077506f99 Revert "Discard framebuffer rendering queues when discarding layers"
This reverts commit da96f8ac2c.
2011-11-14 11:39:30 -08:00
Mathias Agopian
3f511aaf1c am a16ee939: am 28587497: Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" into ics-mr1
* commit 'a16ee9390e1fcea8ff7cbefd253659c37f2999a3':
  Discard framebuffer rendering queues when discarding layers Bug #5581817
2011-11-14 07:49:07 -08:00
Adam Powell
cd6faca836 am b22eec57: am a8743f15: Fix bug 5425280 - Two ActionBar icons show up
* commit 'b22eec57d559fc9dd5663abdc37d6b6e6a4f641f':
  Fix bug 5425280 - Two ActionBar icons show up
2011-11-14 07:48:58 -08:00
Kristian Monsen
e1d2f3cf85 Fix build
Change-Id: I8198f7a8470e7c9500ab2f6512162bbb55ea6ee7
2011-11-14 15:28:14 +00:00
Kristian Monsen
10a09dc163 Merge "Removing the ability to get native instrumentation as part of nav dump" 2011-11-14 04:28:32 -08:00
Mathias Agopian
7c112d1bfb 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
2011-11-14 00:54:30 -08:00
Mathias Agopian
2858749704 Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" into ics-mr1 2011-11-14 00:52:09 -08:00
Adam Powell
4b620213b7 am a8743f15: Fix bug 5425280 - Two ActionBar icons show up
* commit 'a8743f152aac4a8ef97c79bdad5232614453ce2a':
  Fix bug 5425280 - Two ActionBar icons show up
2011-11-11 20:34:31 -08:00
Adam Powell
a8743f152a Fix bug 5425280 - Two ActionBar icons show up
Change-Id: Ic82f8ce648f9314a0800eeff326df7d8dfe5027b
2011-11-11 18:35:53 -08:00
Svetoslav Ganov
531ded5514 Merge "Added missing comments in Instrumentation#sendStringSync" 2011-11-11 16:52:37 -08:00
Svetoslav Ganov
f434e37945 Added missing comments in Instrumentation#sendStringSync
Change-Id: Ib20c5f9763c4ff97dec02fbb79721da93e964bc7
2011-11-11 16:50:25 -08:00
Svetoslav Ganov
55c6ccce95 Merge "Instrumentation sendStringSync(String) may try to inject obsolete events." 2011-11-11 16:46:07 -08:00
Christopher Tate
c45fa2a823 am 0fbd9eba: am c51bb4d3: Merge "XML parsing optimizations" into ics-mr1
* commit '0fbd9ebab891530290b4d52fd5e81f6b4d7278d8':
  XML parsing optimizations
2011-11-11 16:24:19 -08:00
Christopher Tate
432c210fe3 am c51bb4d3: Merge "XML parsing optimizations" into ics-mr1
* commit 'c51bb4d394dd47e48abc8a6d9cbc740f821546ff':
  XML parsing optimizations
2011-11-11 16:21:52 -08:00
Christopher Tate
60201f2b4e XML parsing optimizations
Traceview showed approximately 10% of total parse time inside the
synthetic 'trampoline' methods generated to provide inner classes
with access to their outer class's private fields.  The bottleneck
in this particular case is in XmlBlock and its inner class Parser.

Making the bottlneck outer-class members and methods package-scope
instead of private removes that 10% overhead being spent within
these access trampolines.

Traceview tends to overemphasize the significance of very small
methods such as these trampolines.  That said, the measured speed
gain on the ParseLargeXmlResFg op due to this patch is between
5% and 6%.

Change-Id: Ia0e3ae5408d1f9992b46e6e30dd2407090379b07
2011-11-11 16:10:42 -08:00
Jeff Brown
0f6ba9267f Merge "Seems to break text views all over. Particularly noticeable is that the labels in launcher icons appear left-justified. Multi-line text fields also wrap after every character." 2011-11-11 15:30:45 -08:00
Jeff Brown
033a001a61 Seems to break text views all over. Particularly noticeable is that the labels in launcher icons appear left-justified. Multi-line text fields also wrap after every character.
Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"

This reverts commit caa8c06de5
2011-11-11 15:30:16 -08:00
Dianne Hackborn
942d51f6a6 am 0b554bab: am d400d03f: Merge "Fix issue #5595933: GREF leak due to race condition in..." into ics-mr1
* commit '0b554bab585fe2d7eaaca8692106e0cbbc3aabe4':
  Fix issue #5595933: GREF leak due to race condition in...
2011-11-11 14:28:57 -08:00
Christopher Tate
951aa9d8ea am 9acae658: am 847fbbea: Merge "Localized optimizations in views and bitmaps" into ics-mr1
* commit '9acae658e179796beee91d673f9f70af49ae3c9b':
  Localized optimizations in views and bitmaps
2011-11-11 14:28:55 -08:00
Dianne Hackborn
75348437a3 am d400d03f: Merge "Fix issue #5595933: GREF leak due to race condition in..." into ics-mr1
* commit 'd400d03f4a6384449f8b0d3c8a9aa7e1e8aa5a16':
  Fix issue #5595933: GREF leak due to race condition in...
2011-11-11 14:27:03 -08:00
Christopher Tate
090fb77e58 am 847fbbea: Merge "Localized optimizations in views and bitmaps" into ics-mr1
* commit '847fbbeaf9e3ba187a45d0a631f0c087ce25b7f6':
  Localized optimizations in views and bitmaps
2011-11-11 14:27:01 -08:00
Dianne Hackborn
d400d03f4a Merge "Fix issue #5595933: GREF leak due to race condition in..." into ics-mr1 2011-11-11 14:24:58 -08:00