drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,198 Commits 1 Branch 0 Tags
Commit Graph

62198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Block
13ad467a91 Add tests for invalid and static methods in the WebView's Java Bridge 
Change-Id: I18dacf4a4de8c787e46ea2781f5a365372a0a7da
 2011-11-14 18:26:41 +00:00
Eric Laurent
02e1c6fe23 am 25924f8f: am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 
* commit '25924f8f6c0a4ca4a2eb257b72d9625f69d2525e':
  audioflinger: fix noise when skipping to next song
 2011-11-14 08:41:40 -08:00
Eric Laurent
25924f8f6c am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 
* commit '030bb99814157b6424c0bf290bd2ede217b5ba77':
  audioflinger: fix noise when skipping to next song
 2011-11-14 08:39:33 -08:00
Eric Laurent
030bb99814 Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 2011-11-14 08:38:05 -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
Scott Main
e7a8aae0a6 am 807c07b5: am 2af9f21c: am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0 
* commit '807c07b564564b6f5cf3711e4743de9c25a38175':
 2011-11-14 07:49:06 -08:00
Jeff Brown
91a0fb5af9 am ffa5d463: am 6f0464e7: am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls. 
* commit 'ffa5d463c36e2127ff10a03ee49f0677567c02c1':
 2011-11-14 07:49:04 -08:00
Adam Powell
a53e431d6c am ec44bdaa: (-s ours) 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 'ec44bdaaadcceaae8ab6fe5c4bd17d59fc00d7e3':
 2011-11-14 07:49:03 -08:00
Robert Ly
3d0f1600b7 am 19aa78a4: am 632f072b: am 5f8b7269: docs: fix typo 
* commit '19aa78a40316b31531c57f1bf222e0bf2d1b5673':
 2011-11-14 07:49:01 -08:00
Robert Ly
e01affd0c9 am fafda521: am 83c16e25: am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0 
* commit 'fafda5210f54705fdf36baeee0064d46e6e1994e':
 2011-11-14 07:49:00 -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
Mathias Agopian
a16ee9390e 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 07:46:03 -08:00
Scott Main
807c07b564 am 2af9f21c: am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0 
* commit '2af9f21c664d4579b5f51283a320a7d1fba13a75':
 2011-11-14 07:46:03 -08:00
Jeff Brown
ffa5d463c3 am 6f0464e7: am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls. 
* commit '6f0464e79d6d41d8255a6b0b6695fa7f67a0f65f':
 2011-11-14 07:46:02 -08:00
Adam Powell
ec44bdaaad 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':
 2011-11-14 07:46:01 -08:00
Robert Ly
19aa78a403 am 632f072b: am 5f8b7269: docs: fix typo 
* commit '632f072b223f5f682f4152551a61cec2456b2186':
 2011-11-14 07:46:01 -08:00
Robert Ly
fafda5210f am 83c16e25: am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0 
* commit '83c16e2577705b577d2c74d45b0e55a50a0806e2':
 2011-11-14 07:46:00 -08:00
Adam Powell
b22eec57d5 am a8743f15: Fix bug 5425280 - Two ActionBar icons show up 
* commit 'a8743f152aac4a8ef97c79bdad5232614453ce2a':
  Fix bug 5425280 - Two ActionBar icons show up
 2011-11-14 07:46:00 -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
2858749704 Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" into ics-mr1 2011-11-14 00:52:09 -08:00
The Android Automerger
0949a5cbc6 merge in ics-mr0-release history after reset to ics-mr0 2011-11-13 06:28:23 -08:00
Jeff Brown
d9e688cab3 Clean up GenerationCache. 
Use const references to keys and values where appropriate to avoid
copying them unnecessarily.

Deleted some dead code.

Simplified a few pieces that were doing unnecessary redundant work.

Change-Id: Ib2145b7094a40db2d679e05dafe050fe1e87b846
 2011-11-11 22:14:07 -08:00
Scott Main
e3571f633a am 30870e32: am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0 
* commit '30870e32de4d7338d0aa957458ec63df9806f9da':
  Docs: update state list drawable with state_activated and revise selected/focused
 2011-11-11 20:37:14 -08:00
Jeff Brown
ad169f49af am 0e4669c8: am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls. 
* commit '0e4669c81009cea51d9d7b42b7ff665f44e78aa6':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
 2011-11-11 20:37:12 -08:00
Adam Powell
5a21ca5bb6 am 811959f4: (-s ours) 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 '811959f474f1b39b655935aa0ad3ab70125c992c':
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
 2011-11-11 20:37:10 -08:00
Robert Ly
b8b727ecc0 am 2dd19b44: am 5f8b7269: docs: fix typo 
* commit '2dd19b4456450706d78f409b526cb6a9979a5f33':
  docs: fix typo
 2011-11-11 20:37:08 -08:00
Robert Ly
17161d7a54 am 6be50a40: am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0 
* commit '6be50a40549a16a3aa3fc1d4360483ab3e898501':
  docs: ndk r7 rel notes
 2011-11-11 20:37:06 -08:00
Scott Main
30870e32de 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
 2011-11-11 20:34:51 -08:00
Jeff Brown
0e4669c810 am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls. 
* commit 'f1f0c873b1d119a19342cb67ca77b59607951659':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
 2011-11-11 20:34:48 -08:00
Adam Powell
811959f474 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.
 2011-11-11 20:34:45 -08:00
Robert Ly
2dd19b4456 am 5f8b7269: docs: fix typo 
* commit '5f8b7269d66acb45dcb74a1eb38102cb1d1431df':
  docs: fix typo
 2011-11-11 20:34:43 -08:00
Robert Ly
6be50a4054 am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0 
* commit '5ad6f646fbe692b94961df6472bec2b8bd1ea382':
  docs: ndk r7 rel notes
 2011-11-11 20:34:39 -08:00
Scott Main
2af9f21c66 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
 2011-11-11 19:22:07 -08:00
Jeff Brown
6f0464e79d am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls. 
* commit 'f1f0c873b1d119a19342cb67ca77b59607951659':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
 2011-11-11 19:22:04 -08:00
Adam Powell
771d0c99f6 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.
 2011-11-11 19:22:02 -08:00
Robert Ly
632f072b22 am 5f8b7269: docs: fix typo 
* commit '5f8b7269d66acb45dcb74a1eb38102cb1d1431df':
  docs: fix typo
 2011-11-11 19:22:01 -08:00
Robert Ly
83c16e2577 am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0 
* commit '5ad6f646fbe692b94961df6472bec2b8bd1ea382':
  docs: ndk r7 rel notes
 2011-11-11 19:17:23 -08:00
Jeff Brown
fd1d05a01a Fix bug in TextLayoutCacheKey handling embedded nulls. 
We were not passing the length of the UTF-16 string to
String16::setTo.  As a result, it was copying the contents of
the text up to the first null it found.

First problem, these strings are not typically null terminated!

Second problem, if the string contained a null character, then
we might truncate it.  However, we only truncated the string
when the copy constructor was invoked (say, when we called
get() on the cache) but not in internalTextCopy() (before
adding the key to the cache).

As a result of the second problem, we would first search
the cache for a key that matched a partially copied truncated
string (potentially reading uninitialized memory that followed it).
Finding none, we would add the entry to the cache using
the correct key.

If the cache already had a value associated with the correct key,
then the put would fail, returning false.  Charging ever onwards,
we would add the size of the entry to the cache size.

Proceeding in this manner, it was possible for the cache to
believe it had less remaining space than it really did.  At that
point, it was possible for the cache to evict all entries and
yet still not think it had room to add a new one, so it would
continue trying to make space indefinitely.

Bug: 5576812
Change-Id: I05251594f6b2da0a5dc09f7200f04fe9100ec766
 2011-11-11 19:08:22 -08:00
Adam Powell
72465ea787 DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an 
overflow menu under invalid circumstances.

Change-Id: Ifb847b914b880ffb21dd5fc6efa833f46466f224
 2011-11-11 18:47:45 -08:00
Mathias Agopian
b89d88f531 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
 2011-11-11 18:44:35 -08:00
Adam Powell
a8743f152a Fix bug 5425280 - Two ActionBar icons show up 
Change-Id: Ic82f8ce648f9314a0800eeff326df7d8dfe5027b
 2011-11-11 18:35:53 -08:00
Scott Main
19b1c12b5e Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0 2011-11-11 17:17:23 -08:00
Fabrice Di Meglio
8661489545 Merge "Improve the logging in TextLayoutCache." 2011-11-11 16:58:10 -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
Eric Laurent
f9c361dec4 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
 2011-11-11 16:33:24 -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
0fbd9ebab8 am c51bb4d3: Merge "XML parsing optimizations" into ics-mr1 
* commit 'c51bb4d394dd47e48abc8a6d9cbc740f821546ff':
  XML parsing optimizations
 2011-11-11 16:21:28 -08:00