62691 Commits

Author SHA1 Message Date
Svetoslav Ganov
d8a3cabcb1 Merge "Text selection AccessibilityEvents are missing text." into ics-mr1 2011-11-18 14:39:05 -08:00
Mathias Agopian
b05bb17eeb don't report an error when disconnecting from an abandoned surfacetexture
this happens often with CPU Surfaces, which disconnect long
after their surfacetexture has been abandoned.

Change-Id: If49da03b72f99130e01b2b9bcbd444bb38f7ed4e
2011-11-18 14:32:35 -08:00
Marco Nelissen
d4b22ab488 status_t != bool
b/5567433

Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
2011-11-18 14:21:34 -08:00
Jesse Wilson
ec527e5ece Fix the backups example to use a simpler lock.
Change-Id: If9a78654b0d6bc25f0a04deb8020275e5b3d91ab
2011-11-18 17:18:16 -05:00
Wei Huang
bcedde3cd6 am c2fff5ea: Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
* commit 'c2fff5ea39027d017dc15ce285961afa17a7b4a7':
  Unlock camera AWB lock only when white-balance is changed.
2011-11-18 14:02:44 -08:00
Daisuke Miyakawa
26650aef86 Merge "Introduce Callable URI as hidden API" 2011-11-18 14:02:28 -08:00
Wei Huang
c2fff5ea39 Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1 2011-11-18 14:00:09 -08:00
Jeff Sharkey
d813e79009 Merge "Clean up NMS AIDL and permissions checking." 2011-11-18 13:57:59 -08:00
Jim Miller
76b2337cfa resolved conflicts for merge of 1a783be3 to master
Change-Id: Ibaff3547ac51250fe40adf3aa06d6a30ecfcef54
2011-11-18 13:56:20 -08:00
satok
e30983e799 Do not merge. Fix a memory leak of a Binder in SpellCheckerService
Bug: 5499490
Bug: 5620722
Change-Id: Idfc686595ae8459fff009386332821762d03cbc8
2011-11-19 06:53:31 +09:00
Marco Nelissen
02b370f132 Merge "status_t != bool" 2011-11-18 13:52:35 -08:00
Mathias Agopian
e2fa30cba0 enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
this flag should be enabled for all targets, but currently
some have issues with it, so we're turning it on only for
tested targets.

this will hopefully resolve some performance issues.

Bug: 5553562, 5631630
Change-Id: I54c7a9e2068586898ab13e405d95534669260537
2011-11-18 13:50:35 -08:00
The Android Open Source Project
45b27a438c am d5280e51: Reconcile with ics-mr0-release
* commit 'd5280e51aa4578ff47bffc166f74d79c17358589':
2011-11-18 13:35:32 -08:00
Mathias Agopian
d0df44b5c9 am 4d71053b: Merge "attempt to fix bug 5313580" into ics-mr1
* commit '4d71053b0728b248d80d7d5a098df459722e2be0':
  attempt to fix bug 5313580
2011-11-18 13:35:23 -08:00
Bart Sears
cb513ba7f1 am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1
* commit 'e6a96560ed96e5121db2e22168698f14338c8f1d':
  Content and viewport rects set in one step.
2011-11-18 13:35:14 -08:00
The Android Open Source Project
d5280e51aa Reconcile with ics-mr0-release
Change-Id: I805d2b484b72fb640a889ff2a4b67944cbbe012a
2011-11-18 13:12:33 -08:00
Marco Nelissen
1cad15207d status_t != bool
b/5567433

Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
2011-11-18 13:10:56 -08:00
Jeff Sharkey
af75c33e8d Clean up NMS AIDL and permissions checking.
Bug: 5472290
Change-Id: I30f9d79b1bc7f1d156a3b81b003f2b8ce25d53af
2011-11-18 12:41:12 -08:00
Andreas Huber
0ba8660ea6 Report a runtime error instead of asserting on malformed avc configuration data.
Change-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845
related-to-bug: 5641069
2011-11-18 12:22:59 -08:00
Mathias Agopian
4d71053b07 Merge "attempt to fix bug 5313580" into ics-mr1 2011-11-18 12:11:15 -08:00
Jesse Wilson
64b0acf07b Merge "Remove untrue tip about zero-length arrays." 2011-11-18 12:06:42 -08:00
Jesse Wilson
59346fc4e8 Remove untrue tip about zero-length arrays.
Change-Id: I45ee2d603c1286c96acaa35d0c0fc28ecda47cef
2011-11-18 15:02:15 -05:00
Bart Sears
e6a96560ed Merge "Content and viewport rects set in one step." into ics-mr1 2011-11-18 11:46:26 -08:00
Svetoslav Ganov
84dd52e394 Text selection AccessibilityEvents are missing text.
The text selection change event was not added to the text
populating accessibility events in View.

bug:5638709

Change-Id: Ie7e319bc07d7e6c48f178a6c1bd22b1fe32ff515
2011-11-18 10:26:54 -08:00
Svetoslav Ganov
322f884dfd am 0358787f: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
* commit '0358787f68c48fb10f2d8067fd53f0471481320a':
  Add the support libraries to the platform documentation (build).
2011-11-18 10:14:04 -08:00
Svetoslav Ganov
0358787f68 Merge "Add the support libraries to the platform documentation (build)." into ics-mr1 2011-11-18 10:11:35 -08:00
Daniel Sandler
5207d9c94b Dismiss system windows when screen savers start.
Also add a couple more flags to the intent:
 - NO_HISTORY (finish activity on suspend)
 - FLAG_FROM_BACKGROUND

Bug: 5578434
Change-Id: I97b965175a27760b819dc29ddb57865c5f4754d6
2011-11-18 09:30:08 -08:00
Guang Zhu
33d4dde058 am 1753fd00: am 3af8b699: Merge "add a self instrumentation into framework perf app" into ics-mr1
* commit '1753fd00764614213cfb9f88b00ee16fe3c1da3e':
  add a self instrumentation into framework perf app
2011-11-18 09:15:56 -08:00
satok
b9fc0a4d86 am 852b589a: am 1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1
* commit '852b589a51531f8f7a166f36f7596c255896f35c':
  Hide/show ime switch icon properly
2011-11-18 09:15:54 -08:00
Kristian Monsen
4aad1022eb Improving PictureListener deprecating comments
Change-Id: If189823962c49db9681845996e97eec31fedcca6
2011-11-18 17:09:12 +00:00
Daniel Sandler
2d54536d08 Dreams (now Screen Candy) development.
- support for global "disable" setting
- renamed settings provider keys to remove "DREAM"

Bug: 5591015
Change-Id: I31f31b3ca6001fec1e0032a49cdf0d10df7b0ec7
2011-11-18 08:00:04 -08:00
Joe Fernandez
0c778cdd9c am dea90a0e: am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0
* commit 'dea90a0e1c9c1d15657024893b6793dc21bc27ef':
  docs: Camera Features for developers
2011-11-18 06:17:59 -08:00
Joe Fernandez
dea90a0e1c am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0
* commit '366113fa1bea5ef39cf6557f18ff00310eb6e458':
  docs: Camera Features for developers
2011-11-18 06:14:01 -08:00
Scott Main
e17a4a0261 am d353df8d: am 48eaa6c9: docs: update caption for action bar figure to match new screenshot
* commit 'd353df8db4f51868e1e09463b2c25e3637ad8e95':
  docs: update caption for action bar figure to match new screenshot
2011-11-18 02:53:00 -08:00
Scott Main
d353df8db4 am 48eaa6c9: docs: update caption for action bar figure to match new screenshot
* commit '48eaa6c9e5ab224201b17d2ea3e7e43e04c40f3b':
  docs: update caption for action bar figure to match new screenshot
2011-11-18 02:49:49 -08:00
Jim Miller
be3bf963c4 am a8606cf6: am 398f80ea: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit 'a8606cf661fde3300165f181c5825cf0535adc66':
  Fix 5620754: don't show pattern screen after SIM PUK unlock
2011-11-18 02:37:49 -08:00
Jamie Gennis
892a9d674d am 9da22d2c: am 2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1
* commit '9da22d2cc31069d86a92021d8540bb5a77c9591b':
  SurfaceTexture: fix a bug with buffer reallocation
2011-11-18 02:37:41 -08:00
Jamie Gennis
99f0528b5e am e2fca63a: am c8fd6e30: Merge "EGL: fix blob cache extension detection" into ics-mr1
* commit 'e2fca63a18c7bd3fb0c14e1c5dc391cd699cea9f':
  EGL: fix blob cache extension detection
2011-11-18 02:37:39 -08:00
David Brown
7476ea58f7 am 7d22534b: am 3f51f954: Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1
* commit '7d22534b4cba49b1bd9d88969c3189a2c6fecf55':
  Fix a crash caused by SIP addresses containing "%40" instead of "@"
2011-11-18 02:37:28 -08:00
Jamie Gennis
fa1a6eb584 am 0272e600: am a37a78e2: Merge "GLES: add image external enums" into ics-mr1
* commit '0272e60060162d2c32aec02d9cd1414dbbe14782':
  GLES: add image external enums
2011-11-18 02:37:22 -08:00
The Android Open Source Project
e761f1e58f am 17c01198: am 31b0c687: Reconcile with ics-mr0-release
* commit '17c011985e53e7513c13bc1ed40aa65222dc660a':
2011-11-18 02:37:17 -08:00
Wu-cheng Li
b838d8d4a2 Unlock camera AWB lock only when white-balance is changed.
bug:5633546
Change-Id: I90bb4b5b445daedf38a64e2f8fb980fc0f0aaa81
2011-11-18 15:21:47 +08:00
Daniel Sandler
2e56995e9e am da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1
* commit 'da0e7b0c7a0bb1f9f972c3ed042b8cd752031046':
  Tie screen saver to the screen off timeout.
2011-11-17 21:04:37 -08:00
Daniel Sandler
da0e7b0c7a Merge "Tie screen saver to the screen off timeout." into ics-mr1 2011-11-17 21:02:40 -08:00
Adam Powell
65035d2a72 am 8c54182f: Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1
* commit '8c54182f0b6c706adc6247d6f1da7147b357920d':
  Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
2011-11-17 19:46:19 -08:00
Adam Powell
8c54182f0b Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1 2011-11-17 19:44:14 -08:00
Jim Miller
1a783be36f am 70bded0a: Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1
* commit '70bded0ab8390cb53342f1fb1f1ff9ee56f60e5f':
  Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels
2011-11-17 18:59:59 -08:00
Jim Miller
70bded0ab8 Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1 2011-11-17 18:58:20 -08:00
Mathias Agopian
90cbbd1f7f attempt to fix bug 5313580
the working theory here is that a Surface object has become non-promotable
because it lost its last reference; later Surface::readFromParcel is called
the previous surface is found in the cache, but can't be promoted. this causes
a new Surface object to be created which will promptly try to connect to the
CPU_API -- this in turn will fail because the previous (now dead) surface is
still connected.

To fix this, we make sure to disconnect from the SurfaceTexture when
Surface[TextureClient] is destroyed.

Change-Id: I422234868a05d7b7d283e9d5a85f7ab79e65d8a9
2011-11-17 18:46:09 -08:00
Guang Zhu
1753fd0076 am 3af8b699: Merge "add a self instrumentation into framework perf app" into ics-mr1
* commit '3af8b699830bb5804f3c1b6420d9210b2fd8adb9':
  add a self instrumentation into framework perf app
2011-11-17 18:06:18 -08:00