OSDN Git Service
Scott Main [Wed, 15 Dec 2010 00:46:56 +0000 (16:46 -0800)]
am
a925b6a6: am
93d204ed: cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug:
3258882
* commit '
a925b6a64c8137804547d5cfcd97415392d667b1':
cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug:
3258882
Scott Main [Wed, 15 Dec 2010 00:43:41 +0000 (16:43 -0800)]
am
627b78f4: am
071360d1: cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 Doc change: Update min glibc version for linux.
* commit '
627b78f49d06cb9e317915c86e64906fc671343c':
cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 Doc change: Update min glibc version for linux.
Scott Main [Wed, 15 Dec 2010 00:43:28 +0000 (16:43 -0800)]
am
93d204ed: cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug:
3258882
* commit '
93d204ed98019322e434b714c7c0a619d69f24f5':
cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug:
3258882
Scott Main [Wed, 15 Dec 2010 00:40:39 +0000 (16:40 -0800)]
am
071360d1: cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 Doc change: Update min glibc version for linux.
* commit '
071360d1fe5cb75925e5a7ff1b799c5cab160a44':
cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 Doc change: Update min glibc version for linux.
Brad Fitzpatrick [Wed, 15 Dec 2010 00:28:33 +0000 (16:28 -0800)]
Merge "Add MODE_MULTI_PROCESS flag to Context.getSharedPreferences()"
Scott Main [Wed, 15 Dec 2010 00:26:32 +0000 (16:26 -0800)]
am
178d5005: am
b94df620: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last
* commit '
178d500551c1d88a2e8ec9425d9cbfbb7d998113':
cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last
Scott Main [Wed, 15 Dec 2010 00:22:56 +0000 (16:22 -0800)]
am
b94df620: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last
* commit '
b94df620959de658990c1ed1263e2e1c42df7f6b':
cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last
Christopher Tate [Wed, 15 Dec 2010 00:22:28 +0000 (16:22 -0800)]
Merge "Don't queue multiple pending backups for the same app"
Adam Powell [Wed, 15 Dec 2010 00:11:13 +0000 (16:11 -0800)]
Merge "Add color selectors for transparent cache color hint when accelerated"
Gilles Debunne [Wed, 15 Dec 2010 00:09:56 +0000 (16:09 -0800)]
Merge "update-api step missing. Broken build."
Romain Guy [Wed, 15 Dec 2010 00:05:50 +0000 (16:05 -0800)]
Merge "Continue cleanup refactoring in OpenGLRenderer."
Mathias Agopian [Wed, 15 Dec 2010 00:04:44 +0000 (16:04 -0800)]
Merge "fix [
3223749] media server crashes when switching mode from video capture to still image capture"
Louis Huemiller [Wed, 15 Dec 2010 00:01:45 +0000 (16:01 -0800)]
Merge "HWC Stress Test - relocate print msg"
Mathias Agopian [Tue, 14 Dec 2010 02:51:59 +0000 (18:51 -0800)]
fix [
3223749] media server crashes when switching mode from video capture to still image capture
there was an issue were in some situation SF would call prepare() on hwc
with a NULL handle and never call prepare again.
in this situation, we onw set the SKIP flag to make sure that hwc
won't process this layer and as soon as we receive our first buffer we
trigger a recompute of the visible regions which will end-up calling
prepare() again.
Change-Id: I6b400b2df79712408b9315a9859290c7fcb1609e
Mathias Agopian [Tue, 14 Dec 2010 23:51:41 +0000 (15:51 -0800)]
Merge "fix [
3176642] Camera preview turns completely black for multiple toggles between camera and camcorder app"
Mathias Agopian [Tue, 14 Dec 2010 23:51:32 +0000 (15:51 -0800)]
Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so."
Mathias Agopian [Tue, 14 Dec 2010 23:51:22 +0000 (15:51 -0800)]
Merge "dump callstack on Surface use error"
Jesse Wilson [Tue, 14 Dec 2010 23:41:44 +0000 (15:41 -0800)]
Merge "Move 41 tests to libcore, closer to the tested code. (2nd half)"
Amith Yamasani [Tue, 14 Dec 2010 23:34:08 +0000 (15:34 -0800)]
Merge "Add a way to insert a parent bread crumb so that deep linked settings can navigate up."
Xavier Ducrohet [Tue, 14 Dec 2010 23:33:54 +0000 (15:33 -0800)]
Merge "Create some layout files for HwAccelerationTest"
Robert Greenwalt [Tue, 14 Dec 2010 23:28:01 +0000 (15:28 -0800)]
Merge "Fix some IpV4-only code."
Xavier Ducrohet [Tue, 14 Dec 2010 23:03:26 +0000 (15:03 -0800)]
Merge "LayoutLib: Fix gradient rendering."
Jeff Brown [Tue, 14 Dec 2010 23:02:52 +0000 (15:02 -0800)]
Merge "Improve documentation on Vibrator.vibrate."
Louis Huemiller [Tue, 14 Dec 2010 22:58:55 +0000 (14:58 -0800)]
HWC Stress Test - relocate print msg
Change-Id: I95f9f5c6edffff8c737c4a6996f97e69bccc0448
Adam Powell [Tue, 14 Dec 2010 22:51:13 +0000 (14:51 -0800)]
Merge "Fix bug
3210201 - Popup window wrong size/position when IME hidden"
Adam Powell [Tue, 14 Dec 2010 22:50:09 +0000 (14:50 -0800)]
Merge "Updated spinner assets from UX"
Robert Greenwalt [Tue, 14 Dec 2010 22:40:49 +0000 (14:40 -0800)]
Merge "DHCP core classes, defining data, behavior, and state transitions for the DHCP protocol. The DHCP client and DHCP server classes are not included in this commit: still working out some integration issues with ethernet & wifi services"
Jason Sams [Tue, 14 Dec 2010 22:32:36 +0000 (14:32 -0800)]
Merge "Add support for non-malloc backed textures."
Xavier Ducrohet [Tue, 14 Dec 2010 22:32:09 +0000 (14:32 -0800)]
Merge "LayoutLib: Misc fix to rendering."
Mike Lockwood [Tue, 14 Dec 2010 22:20:34 +0000 (14:20 -0800)]
Merge "MTP: Make recursive delete more efficient"
Dianne Hackborn [Tue, 14 Dec 2010 22:18:33 +0000 (14:18 -0800)]
am
042042b8: am
2bd83c00: Merge "Work on issue #
3255640: Need to bump GB to API 10 version name "2.4"" into gingerbread
* commit '
042042b809e3a0ff6cea915ccc7b176948833be9':
Work on issue #
3255640: Need to bump GB to API 10 version name "2.4"
Dianne Hackborn [Tue, 14 Dec 2010 22:15:16 +0000 (14:15 -0800)]
am
2bd83c00: Merge "Work on issue #
3255640: Need to bump GB to API 10 version name "2.4"" into gingerbread
* commit '
2bd83c00a0c72d3f6bd929c4df5fe83ee31b4704':
Work on issue #
3255640: Need to bump GB to API 10 version name "2.4"
Dianne Hackborn [Tue, 14 Dec 2010 22:12:37 +0000 (14:12 -0800)]
Merge "Work on issue #
3255640: Need to bump GB to API 10 version name "2.4"" into gingerbread
Louis Huemiller [Tue, 14 Dec 2010 22:08:09 +0000 (14:08 -0800)]
Merge "HWC Stres Test Enhancments"
Jeff Brown [Tue, 14 Dec 2010 22:04:59 +0000 (14:04 -0800)]
Merge "Expose split touch API on PopupWindow."
Jesse Wilson [Tue, 14 Dec 2010 22:02:55 +0000 (14:02 -0800)]
Merge "Move HashMapTest from frameworks/base to libcore (second half)"
Romain Guy [Tue, 14 Dec 2010 21:45:07 +0000 (13:45 -0800)]
Merge "Colors are in the [0..1] range, not [0..255]"
Gilles Debunne [Tue, 14 Dec 2010 21:32:23 +0000 (13:32 -0800)]
Merge "Heterogeneous comment for convertView in getView documentation"
James Dong [Tue, 14 Dec 2010 20:28:31 +0000 (12:28 -0800)]
Merge "Fix an issue where a fixed number of bits per sample is used for seek position calculation."
Jeff Brown [Tue, 14 Dec 2010 20:12:07 +0000 (12:12 -0800)]
Merge "Update shortcuts."
Xavier Ducrohet [Tue, 14 Dec 2010 20:03:21 +0000 (12:03 -0800)]
Merge "LayoutLib: Use the new ninepatch API to suppor density."
Gilles Debunne [Tue, 14 Dec 2010 19:59:01 +0000 (11:59 -0800)]
Merge "Removed no longer used longPressCallback in TextView"
Romain Guy [Tue, 14 Dec 2010 19:52:02 +0000 (11:52 -0800)]
Merge "OpenGLRenderer would not render colors < ALPHA_THRESHOLD Bug #
3282805"
Alon Albert [Tue, 14 Dec 2010 19:32:45 +0000 (11:32 -0800)]
Merge "Do not increase backoff before it expires"
Shih-wei Liao [Tue, 14 Dec 2010 19:32:43 +0000 (11:32 -0800)]
Merge "1. Add Context to a RenderScript or RenderScriptGL instance. This is to allow RenderScript to better interact with the Android environment. E.g., per-app cache. 2. Plumbing, testing. 3. Added getApplicationContext in RenderScript.java."
Dan Morrill [Tue, 14 Dec 2010 19:31:29 +0000 (11:31 -0800)]
am
0ccc8b73: am
5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread
* commit '
0ccc8b7345eac0b507c221be47e55926cbda8957':
GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).
Dan Morrill [Tue, 14 Dec 2010 19:28:50 +0000 (11:28 -0800)]
am
5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread
* commit '
5441a9ff2128cf2c5088974c74b79d2d1734f755':
GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).
Dan Morrill [Tue, 14 Dec 2010 19:27:20 +0000 (11:27 -0800)]
Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread
Christopher Tate [Tue, 14 Dec 2010 18:32:05 +0000 (10:32 -0800)]
Merge "Time out orphaned / unresponsive restore sessions"
Louis Huemiller [Tue, 14 Dec 2010 18:22:42 +0000 (10:22 -0800)]
HWC Stres Test Enhancments
+ YV12 width/height divisable by 2
+ Row width determined by getStride()
+ Misc comment and whitespace fixes
+ printf changed to testPrintI
Change-Id: I27551141bafbfb258eb1b6b7f63c5295b1f9501a
Christopher Tate [Tue, 14 Dec 2010 18:31:56 +0000 (10:31 -0800)]
Merge "Don't restore wildly wrong sized wallpapers"
Costin Manolache [Tue, 14 Dec 2010 18:20:41 +0000 (10:20 -0800)]
am
7afa1613: am
a848d344: Merge "Fix bug in permission grant system." into gingerbread
* commit '
7afa161368308e78bb4a66b4fd32558dfd556776':
Fix bug in permission grant system.
Costin Manolache [Tue, 14 Dec 2010 18:14:10 +0000 (10:14 -0800)]
am
a848d344: Merge "Fix bug in permission grant system." into gingerbread
* commit '
a848d3445090e114cbfe61f1c7449122a665fba6':
Fix bug in permission grant system.
Andreas Huber [Tue, 14 Dec 2010 18:11:28 +0000 (10:11 -0800)]
Merge "Properly signal the condition if we run out of input data."
Andreas Huber [Tue, 14 Dec 2010 18:11:11 +0000 (10:11 -0800)]
Merge "Support malformed ID3 V2.4 tags written by early versions of iTunes."
Costin Manolache [Tue, 14 Dec 2010 18:07:26 +0000 (10:07 -0800)]
Merge "Fix bug in permission grant system." into gingerbread
Brad Fitzpatrick [Tue, 14 Dec 2010 00:52:35 +0000 (16:52 -0800)]
Framework-side support for Dalvik "isSensitiveThread" hook.
Used in lock contention stats.
Bug:
3226270
Change-Id: Ie6f58d130a29079a59bdefad40b80304d9bc3623
Chet Haase [Tue, 14 Dec 2010 17:18:33 +0000 (09:18 -0800)]
Merge "Adding TimeAnimator capability (hidden for now)"
satok [Tue, 14 Dec 2010 13:45:44 +0000 (05:45 -0800)]
Merge "Add a Setting preference "INPUT_METHOD_SELECTOR_VISIBILITY""
Joe Onorato [Tue, 14 Dec 2010 09:22:23 +0000 (01:22 -0800)]
Merge "notification panel animations"
Jason Sams [Tue, 14 Dec 2010 07:53:35 +0000 (23:53 -0800)]
Merge "More API updates."
satok [Tue, 14 Dec 2010 06:15:17 +0000 (22:15 -0800)]
Merge "Hide ime switch icon when there are only one IME and no enabled subtypes"
Mike Lockwood [Tue, 14 Dec 2010 06:03:14 +0000 (22:03 -0800)]
Merge "MTP: check for replacing existing files via the database instead of the file system"
Dianne Hackborn [Tue, 14 Dec 2010 04:54:48 +0000 (20:54 -0800)]
Merge "Fix issue #
3258849: Grab thumbnail when exiting an app via back"
Irfan Sheriff [Tue, 14 Dec 2010 03:25:59 +0000 (19:25 -0800)]
Merge "WPS fixes and refactor"
Roman Nurik [Tue, 14 Dec 2010 03:18:26 +0000 (19:18 -0800)]
am
483654fb: am
0a97435c: Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
* commit '
483654fb724c7aab619303b50025b6bb25431e87':
Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack.
Roman Nurik [Tue, 14 Dec 2010 03:15:28 +0000 (19:15 -0800)]
am
0a97435c: Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
* commit '
0a97435c8d776746bb3dcf16824e2cc81eee20aa':
Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack.
Roman Nurik [Tue, 14 Dec 2010 03:12:42 +0000 (19:12 -0800)]
Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
Jeff Brown [Tue, 14 Dec 2010 02:33:00 +0000 (18:33 -0800)]
Merge "Make framework modifier key handling more precise."
Romain Guy [Tue, 14 Dec 2010 02:30:15 +0000 (18:30 -0800)]
Merge "Refactor OpenGLRenderer to simplify OpenGL drawing code."
Xavier Ducrohet [Tue, 14 Dec 2010 02:24:11 +0000 (18:24 -0800)]
Merge "LayoutLib: implement more of Canvas/Paint."
Gilles Debunne [Tue, 14 Dec 2010 02:11:51 +0000 (18:11 -0800)]
Merge "setTextIsSelectable documentation updated."
Adam Powell [Tue, 14 Dec 2010 02:06:00 +0000 (18:06 -0800)]
Merge "Fix bug
3281956 - Cherry-picked from GB"
Jaikumar Ganesh [Tue, 14 Dec 2010 00:49:50 +0000 (16:49 -0800)]
Merge "Remove delay with auto connection."
Mathias Agopian [Tue, 14 Dec 2010 00:49:05 +0000 (16:49 -0800)]
fix [
3176642] Camera preview turns completely black for multiple toggles between camera and camcorder app
There was a leak of Surface tokens when a surface was detached from a UserClient.
We now always detach a surface from its client before attaching to the new one,
this guarantees that its token is freed.
Change-Id: Icfad0b16286ed58155bdfafdf36ab161440aa485
Scott Main [Tue, 14 Dec 2010 00:48:43 +0000 (16:48 -0800)]
Merge "docs: remove getting started guide for preview"
Mathias Agopian [Tue, 14 Dec 2010 00:47:31 +0000 (16:47 -0800)]
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so.
Change-Id: I3bdca74351c8e480a05084bc412a96c5f685221d
Chet Haase [Tue, 14 Dec 2010 00:47:00 +0000 (16:47 -0800)]
Merge "Fix artifact with concurrent add/remove LayoutTransitions"
Brad Fitzpatrick [Tue, 14 Dec 2010 00:30:17 +0000 (16:30 -0800)]
am
2d5b11ab: am
0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
* commit '
2d5b11aba0fec21e1ce3f358eb0d280b62704899':
Fix StrictMode javadoc copy/paste error.
Nick Kralevich [Tue, 14 Dec 2010 00:30:10 +0000 (16:30 -0800)]
am
30ad1e57: am
9dbef975: Merge "Avoid leaking sockets." into gingerbread
* commit '
30ad1e576a445b8ffec12ef148f5d7253ebb6ef4':
Avoid leaking sockets.
Dianne Hackborn [Tue, 14 Dec 2010 00:28:01 +0000 (16:28 -0800)]
Merge "resolved conflicts for merge of
78e9f4cb to master"
Brad Fitzpatrick [Mon, 13 Dec 2010 23:27:25 +0000 (15:27 -0800)]
am
0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
* commit '
0927c9026537166cec36b2f9bb8a764ef8a7c606':
Fix StrictMode javadoc copy/paste error.
Brad Fitzpatrick [Mon, 13 Dec 2010 23:25:09 +0000 (15:25 -0800)]
Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
Alex Sakhartchouk [Mon, 13 Dec 2010 23:24:20 +0000 (15:24 -0800)]
Merge "Perf test"
Nick Kralevich [Mon, 13 Dec 2010 23:05:20 +0000 (15:05 -0800)]
am
9dbef975: Merge "Avoid leaking sockets." into gingerbread
* commit '
9dbef975f0f4370dfe48a0fb040e3d8d1eb91d87':
Avoid leaking sockets.
Nick Kralevich [Mon, 13 Dec 2010 23:03:28 +0000 (15:03 -0800)]
Merge "Avoid leaking sockets." into gingerbread
Dianne Hackborn [Mon, 13 Dec 2010 22:55:25 +0000 (14:55 -0800)]
resolved conflicts for merge of
78e9f4cb to master
Change-Id: I1135361e6d66f524c3f349e2bf1f31bd4191c634
Romain Guy [Mon, 13 Dec 2010 22:43:41 +0000 (14:43 -0800)]
Merge "Improve error detection in HardwareRenderer.draw(). Bug #
3280872"
Dianne Hackborn [Mon, 13 Dec 2010 22:37:09 +0000 (14:37 -0800)]
am
e4a59519: Fix issue #
3154576: battery stats checkin should include UID -> packages+ map
* commit '
e4a5951925f16f18dae91ed65567e96528f17fee':
Fix issue #
3154576: battery stats checkin should include UID -> packages+ map
Brian Carlstrom [Mon, 13 Dec 2010 22:30:39 +0000 (14:30 -0800)]
Merge "Update API for CopyOnWriteArrayList "synchronized" changes"
Jim Miller [Mon, 13 Dec 2010 22:28:17 +0000 (14:28 -0800)]
Merge "Fix
3253629: Improve Recents panel animation performance."
Louis Huemiller [Mon, 13 Dec 2010 22:17:23 +0000 (14:17 -0800)]
Merge "Hardware Composer Stress Test Enhancements"
Mike Lockwood [Mon, 13 Dec 2010 21:54:09 +0000 (13:54 -0800)]
Merge "PowerManager: remove unused import"
Jaikumar Ganesh [Mon, 13 Dec 2010 21:42:42 +0000 (13:42 -0800)]
Merge "Add direct calls to Bluez to add SDP records."
Leon Scroggins [Mon, 13 Dec 2010 21:24:41 +0000 (13:24 -0800)]
Merge "Use black text on white background for dropdowns."
Louis Huemiller [Mon, 13 Dec 2010 07:05:31 +0000 (23:05 -0800)]
Hardware Composer Stress Test Enhancements
Enhancements include:
+ Change default delay after each set operation
from 0.1 to 0.0 seconds. This significantly
increases the default rate at which operations
are performed.
+ Make sourceCrop to displayFrame scale
factor of 1.0 a frequent occurance.
+ Enable use of RGB888 and YV12 graphic formats.
+ Add initCheck() call after creation of a
GraphicBuffer, to confirm it was created
without any errors.
Change-Id: I1606dff3924a23bdd5cb27ba302bebb4f200d768
Jean-Baptiste Queru [Mon, 13 Dec 2010 21:12:36 +0000 (13:12 -0800)]
am
6d13b146: am
e78a0009: resolved conflicts for merge of
4b94c451 to stage-korg-master
* commit '
6d13b146e0444f40f45b9fe5812093c5e611b68e':
Added dropbox broadcast notification
Jean-Baptiste Queru [Mon, 13 Dec 2010 21:10:23 +0000 (13:10 -0800)]
am
e78a0009: resolved conflicts for merge of
4b94c451 to stage-korg-master
* commit '
e78a000955c283509ee8a21b8b7e448060ac8dd8':
Added dropbox broadcast notification
Jean-Baptiste Queru [Mon, 13 Dec 2010 21:06:13 +0000 (13:06 -0800)]
resolved conflicts for merge of
4b94c451 to stage-korg-master
Change-Id: I07b974f96ca598677e58623050e4668822e68f23
Brandon Keely [Mon, 13 Dec 2010 21:04:00 +0000 (13:04 -0800)]
Merge "Massaging system transitions."