Chia-chi Yeh
cb6ee06f62
SIP: turn off verbose logs.
...
Bug: 5616713
Change-Id: Iaf2e6878731d10d7f4f2a7cd8af71f4517780642
2011-11-18 16:57:21 -08:00
satok
e36657e541
Merge "Do not merge. Fix a memory leak of a Binder in SpellCheckerService" into ics-mr0
2011-11-18 16:39:20 -08:00
The Android Open Source Project
4a8a67950e
am 0e2c2f39: Reconcile with ics-mr0-release
...
* commit '0e2c2f3971eb4b246a5c1b198370e003668f53ee':
2011-11-18 15:53:14 -08:00
The Android Open Source Project
0e2c2f3971
Reconcile with ics-mr0-release
...
Change-Id: I61ef83c288814c62369fabdcf50d867708f05f51
2011-11-18 15:49:39 -08:00
The Android Automerger
0cd1fe7304
merge in ics-mr0-release history after reset to ics-mr0
2011-11-18 15:37:45 -08:00
Marco Nelissen
5b381ec95f
am 7ff7821a: am d4b22ab4: status_t != bool
...
* commit '7ff7821a601a39fffb318e29873957b4a3703c46':
status_t != bool
2011-11-18 15:10:38 -08:00
Marco Nelissen
7ff7821a60
am d4b22ab4: status_t != bool
...
* commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98':
status_t != bool
2011-11-18 15:07:21 -08:00
Svetoslav Ganov
44e3a8a4ac
am d8a3cabc: Merge "Text selection AccessibilityEvents are missing text." into ics-mr1
...
* commit 'd8a3cabcb11c02c54b76590e0f60c32b43b9f2fc':
Text selection AccessibilityEvents are missing text.
2011-11-18 14:41:09 -08:00
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
Wei Huang
2361032a4d
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:15 -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
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
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
b3ec8b5325
am d5280e51: Reconcile with ics-mr0-release
...
* commit 'd5280e51aa4578ff47bffc166f74d79c17358589':
2011-11-18 13:16:16 -08:00
The Android Open Source Project
d5280e51aa
Reconcile with ics-mr0-release
...
Change-Id: I805d2b484b72fb640a889ff2a4b67944cbbe012a
2011-11-18 13:12:33 -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
6166318fd5
am 4d71053b: Merge "attempt to fix bug 5313580" into ics-mr1
...
* commit '4d71053b0728b248d80d7d5a098df459722e2be0':
attempt to fix bug 5313580
2011-11-18 12:13:55 -08:00
Mathias Agopian
4d71053b07
Merge "attempt to fix bug 5313580" into ics-mr1
2011-11-18 12:11:15 -08:00
Bart Sears
29df4a87a7
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 11:49:40 -08: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
803d2e21b5
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:13:57 -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
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
a8ad94f20d
am dea90a0e: am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0
...
* commit 'dea90a0e1c9c1d15657024893b6793dc21bc27ef':
docs: Camera Features for developers
2011-11-18 06:16:30 -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
b01c9c2160
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:08 -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
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
cbb2f06947
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:35 -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
9a842408c8
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:45:50 -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
1a5163dbc5
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:40 -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
2262acc4de
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:07:25 -08:00
satok
620e4e4de2
am 1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1
...
* commit '1a3c051bcc787363d9154da4a8e8e562dda32926':
Hide/show ime switch icon properly
2011-11-17 18:04:28 -08:00
Guang Zhu
3af8b69983
Merge "add a self instrumentation into framework perf app" into ics-mr1
2011-11-17 18:04:23 -08:00
satok
1a3c051bcc
Merge "Hide/show ime switch icon properly" into ics-mr1
2011-11-17 18:02:09 -08:00
Adam Powell
c992087d09
Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
...
Disable the window-level progress spinner; another is already shown while
connecting.
Use the correct Settings icon for SystemUI.
Specify the activity title for the USB mass storage screen in the
manifest to avoid title flashing during startup.
Change-Id: Ic57af56bf1661a5eaa91fff77471dc8447340d16
2011-11-17 18:01:07 -08:00
Jim Miller
9a3caf39e4
Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels
...
This bug is the result of onPause()/onResume() not being called properly
when we have both lock and unlock screens present, which is true for the SIM
and PUK unlock cases.
The fix is to invoke onPause() and onResume() on both of them if they exist.
Verified the rest of the code correctly handles having both.
Also, when the user cancels, we now clear the fields.
Change-Id: If7fbd31df7eab9e3d60656d50d2392607a4bf471
2011-11-17 17:58:40 -08:00
The Android Automerger
a5dd3bab78
merge in ics-mr0-release history after reset to ics-mr0
2011-11-17 17:49:17 -08:00
Jim Miller
bf4b374256
am 398f80ea: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
...
* commit '398f80eacb8e59d868f287bf273a1253fe219ce4':
Fix 5620754: don't show pattern screen after SIM PUK unlock
2011-11-17 17:45:19 -08:00
Jim Miller
398f80eacb
Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1
2011-11-17 17:41:50 -08:00
Joe Fernandez
366113fa1b
Merge "docs: Camera Features for developers" into ics-mr0
2011-11-17 17:34:33 -08:00