OSDN Git Service
Marco Nelissen [Thu, 5 Jan 2012 22:11:40 +0000 (14:11 -0800)]
Merge "ThumbnailUtils: To fix misuse of FileInputStream."
Steve Block [Thu, 5 Jan 2012 22:07:02 +0000 (14:07 -0800)]
Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"
Fabrice Di Meglio [Thu, 5 Jan 2012 21:55:01 +0000 (13:55 -0800)]
Merge "Fix bug #
5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long"
Scott Main [Thu, 5 Jan 2012 20:09:07 +0000 (12:09 -0800)]
am
47228cac: am
dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
* commit '
47228cac900cd58d0687b6e6d980381cfc8010a1':
docs: second set of diagram updates
docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
The Android Open Source Project [Thu, 5 Jan 2012 20:08:48 +0000 (12:08 -0800)]
am
d32ee5ba: Reconcile with ics-mr1-release
* commit '
d32ee5baa057992431263907ec5cf8f19b43c043':
Robert Greenwalt [Thu, 5 Jan 2012 19:39:26 +0000 (11:39 -0800)]
Merge "Filter our v6 address from tethering dns."
Scott Main [Thu, 5 Jan 2012 17:45:19 +0000 (09:45 -0800)]
am
dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
* commit '
dacbf67ab915fa8b987f6fb9f044160af92652cd':
docs: second set of diagram updates
docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
Scott Main [Thu, 5 Jan 2012 17:42:52 +0000 (09:42 -0800)]
Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
* changes:
docs: second set of diagram updates
docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
Glenn Kasten [Thu, 5 Jan 2012 16:20:10 +0000 (08:20 -0800)]
Merge "Remove the notion of "active track" from mixer"
The Android Open Source Project [Thu, 5 Jan 2012 15:45:28 +0000 (07:45 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8
Glenn Kasten [Thu, 5 Jan 2012 15:38:29 +0000 (07:38 -0800)]
Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"
Glenn Kasten [Thu, 15 Dec 2011 17:51:17 +0000 (09:51 -0800)]
Use the standard CC_LIKELY and CC_UNLIKELY macros
Several source files privately defined macros LIKELY and UNLIKELY in terms
of __builtin_expect. But <cutils/compiler.h> already has CC_LIKELY and
CC_UNLIKELY which are intended for this purpose. So rename the private
uses to use the standard names.
In addition, AudioFlinger was relying on the macro expanding to extra ( ).
Change-Id: I2494e087a0c0cac0ac998335f5e9c8ad02955873
Wink Saville [Thu, 5 Jan 2012 05:52:13 +0000 (21:52 -0800)]
am
3ed28036: am
c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1
* commit '
3ed2803691cc271fe6b893dc46d49fca2fce61df':
Enhancement on ICS data stall polling logic
Wink Saville [Thu, 5 Jan 2012 05:52:10 +0000 (21:52 -0800)]
am
0ad96f89: am
d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
* commit '
0ad96f89401920486b68d8404f6a143870d57500':
Add support of dislaying Alpha tag for BIP commands
Wink Saville [Thu, 5 Jan 2012 05:52:06 +0000 (21:52 -0800)]
am
a3534ad4: am
c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
* commit '
a3534ad4a4b936a2629f4a0b854b814b3494ac7e':
Support suggestedRetryTime in CDMA DCT
Bart Sears [Thu, 5 Jan 2012 05:52:04 +0000 (21:52 -0800)]
am
875b6992: (-s ours) am
705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
* commit '
875b69928193e464243cf491bfe861f30644e9b4':
Do not allow file:// access when it is disabled. Do not merge.
Eric Laurent [Thu, 5 Jan 2012 01:39:12 +0000 (17:39 -0800)]
resolved conflicts for merge of
1a4b9939 to master
Change-Id: I0c910d391a38a916d8431f7d1f5b82e39e1a66c2
The Android Automerger [Thu, 5 Jan 2012 00:42:23 +0000 (16:42 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Wink Saville [Wed, 4 Jan 2012 21:55:28 +0000 (13:55 -0800)]
am
c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1
* commit '
c697ebfdd671c7f4cf338d601917de16d2f1f135':
Enhancement on ICS data stall polling logic
Wink Saville [Wed, 4 Jan 2012 21:53:25 +0000 (13:53 -0800)]
Merge "Enhancement on ICS data stall polling logic" into ics-mr1
Wink Saville [Wed, 4 Jan 2012 21:51:59 +0000 (13:51 -0800)]
am
d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
* commit '
d4d35168129d544f62cee7e1f83c5bf15d9f291d':
Add support of dislaying Alpha tag for BIP commands
Wink Saville [Wed, 4 Jan 2012 21:50:04 +0000 (13:50 -0800)]
Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
Wink Saville [Wed, 4 Jan 2012 21:49:37 +0000 (13:49 -0800)]
am
c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
* commit '
c97d0e43bacdae735071d6d7026175fbc4bdafca':
Support suggestedRetryTime in CDMA DCT
Bart Sears [Wed, 4 Jan 2012 21:49:34 +0000 (13:49 -0800)]
am
705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
* commit '
705665acda5fec6c8c76683b2e5850b0bd447449':
Do not allow file:// access when it is disabled. Do not merge.
Wink Saville [Wed, 4 Jan 2012 21:47:55 +0000 (13:47 -0800)]
Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
Bart Sears [Wed, 4 Jan 2012 21:47:09 +0000 (13:47 -0800)]
Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
Eric Laurent [Wed, 4 Jan 2012 21:00:49 +0000 (13:00 -0800)]
am
fb578b6b: Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1
* commit '
fb578b6b88af51812b71a86ad4dd3a7de56e394b':
audioflinger: fix clicks on 48kHz audio.
Eric Laurent [Wed, 4 Jan 2012 20:58:17 +0000 (12:58 -0800)]
Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1
Siva Velusamy [Tue, 3 Jan 2012 22:39:31 +0000 (14:39 -0800)]
gltrace: add user settings to control data captured.
Currently users do not have control over the amount of data
captured during tracing. This patch adds 3 settings that users
can enable/disable at runtime:
- capture framebuffer on eglSwap() calls
- capture framebuffer on glDraw*() calls
- capture texture data passed to glTexImage*() calls
Disabling these options when not needed signficantly decreases
the size of the trace file, and reduces performance overhead for
the running application.
These settings are stored in the per process GLTraceState.
A separate thread listens for commands from the host, and updates
the state based on the user commands.
Change-Id: Ic4518b94e8bcbc5330ac7138153721caa98b365d
Siva Velusamy [Wed, 4 Jan 2012 20:48:52 +0000 (12:48 -0800)]
Merge "gltrace: add start time & duration to each traced call."
Siva Velusamy [Wed, 4 Jan 2012 20:47:29 +0000 (12:47 -0800)]
Merge "gltrace: transport buffering and context management"
Steve Block [Wed, 4 Jan 2012 20:05:49 +0000 (20:05 +0000)]
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801
Bug:
5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
Scott Main [Wed, 4 Jan 2012 20:03:22 +0000 (12:03 -0800)]
am
319c3bcb: am
c8810c2f: docs: add Teleepoch VID/driver info and update Huawei url
* commit '
319c3bcbb1b0163040984e263b5b16005f81adba':
docs: add Teleepoch VID/driver info and update Huawei url
Scott Main [Wed, 4 Jan 2012 20:01:02 +0000 (12:01 -0800)]
am
c8810c2f: docs: add Teleepoch VID/driver info and update Huawei url
* commit '
c8810c2feb53bd423d0ef31bc10d22fc4cbf9c89':
docs: add Teleepoch VID/driver info and update Huawei url
Siva Velusamy [Fri, 16 Dec 2011 01:32:05 +0000 (17:32 -0800)]
gltrace: add start time & duration to each traced call.
Change-Id: Idfec8f715f6000594b6381cbfdee9fdf6d89f484
Siva Velusamy [Wed, 14 Dec 2011 20:19:56 +0000 (12:19 -0800)]
gltrace: transport buffering and context management
This patch adds two improvements:
1. Protobuf messages are buffered and sent in chunks.
2. Multiple EGL contexts are handled properly: Corresponding
to each EGLContext, a GLTraceContext with a unique ID is created.
On eglMakeCurrent, the appropriate GLTraceContext is set and is
used while tracing subsequent GL Calls in that thread.
Change-Id: I34076376d3e5af205c87c7396ea47659844abd6e
Siva Velusamy [Wed, 4 Jan 2012 19:18:29 +0000 (11:18 -0800)]
Merge "gltrace: attach contents of the appropriate framebuffer"
John Reck [Wed, 4 Jan 2012 18:52:35 +0000 (10:52 -0800)]
Merge "Fix Apache stack"
Steve Block [Wed, 4 Jan 2012 18:13:13 +0000 (10:13 -0800)]
Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE"
Jesse Wilson [Wed, 4 Jan 2012 16:22:36 +0000 (08:22 -0800)]
Merge "Explicitly specify 'milliseconds' as alarm manager's time unit."
Steve Block [Wed, 4 Jan 2012 13:36:57 +0000 (05:36 -0800)]
Merge "Fix AppCache when either no path or an invalid path is supplied"
Elliott Hughes [Wed, 4 Jan 2012 02:54:27 +0000 (18:54 -0800)]
Merge "Fix Music import for Turkish locales."
Christopher Tate [Wed, 4 Jan 2012 01:44:09 +0000 (17:44 -0800)]
am
91582b86: am
30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1
* commit '
91582b86d918b80158654671933cf26c96c34747':
Tweak docs on 'adb logcat'
Christopher Tate [Wed, 4 Jan 2012 01:40:53 +0000 (17:40 -0800)]
am
30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1
* commit '
30ad699c0e246ef3889f691361758235ecb89895':
Tweak docs on 'adb logcat'
Christopher Tate [Wed, 4 Jan 2012 01:38:51 +0000 (17:38 -0800)]
Merge "Tweak docs on 'adb logcat'" into ics-mr1
Scott Main [Wed, 4 Jan 2012 00:00:28 +0000 (16:00 -0800)]
am
f65320a2: am
12d9954d: docs: dasboard update for 1/3/12
* commit '
f65320a2743e81ae1cb62f2dbf60b65a122b9ddb':
docs: dasboard update for 1/3/12
Scott Main [Tue, 3 Jan 2012 23:58:41 +0000 (15:58 -0800)]
am
12d9954d: docs: dasboard update for 1/3/12
* commit '
12d9954d198d29da1a15ba2c6947ce91839cbb83':
docs: dasboard update for 1/3/12
Steve Block [Tue, 20 Dec 2011 16:23:08 +0000 (16:23 +0000)]
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016
Bug:
5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
Romain Guy [Tue, 3 Jan 2012 22:21:18 +0000 (14:21 -0800)]
Merge "Properly restore the GL scissor after a GL draw functor Bug #
5781254"
Danielle Millett [Tue, 3 Jan 2012 21:44:28 +0000 (13:44 -0800)]
Merge "Fix
5783857: Device Policy Manager doesn't allow Face Unlock"
Brian Colonna [Tue, 3 Jan 2012 21:43:07 +0000 (13:43 -0800)]
Merge "Added padding to PIN layout status and carrier text"
Brian Colonna [Tue, 3 Jan 2012 21:42:17 +0000 (13:42 -0800)]
Merge "Unbinding from FU when going to backup"
Jeff Sharkey [Tue, 3 Jan 2012 18:57:19 +0000 (10:57 -0800)]
Merge "Test the correct return code from call to cryptfs."
Dirk Dougherty [Tue, 3 Jan 2012 18:37:48 +0000 (10:37 -0800)]
am
27d2a07a: am
a17e100b: Doc change: fix link target for "Publish" icon.
* commit '
27d2a07a5548e238863135280b706751764ef20f':
Doc change: fix link target for "Publish" icon.
Dirk Dougherty [Tue, 3 Jan 2012 18:35:18 +0000 (10:35 -0800)]
am
a17e100b: Doc change: fix link target for "Publish" icon.
* commit '
a17e100b7a192cae3935d2ae144fb1a1115a4ca7':
Doc change: fix link target for "Publish" icon.
Ben Murdoch [Tue, 3 Jan 2012 10:53:58 +0000 (02:53 -0800)]
Merge "Do not allow file:// access when it is disabled."
Wink Saville [Fri, 30 Dec 2011 00:41:09 +0000 (16:41 -0800)]
Merge "Separate SIM states from Radio states"
Eric Fischer [Thu, 29 Dec 2011 22:46:50 +0000 (14:46 -0800)]
Merge "Import revised translations."
Irfan Sheriff [Thu, 29 Dec 2011 17:11:29 +0000 (09:11 -0800)]
Merge "Add multi-interface support to native calls"
Chia-chi Yeh [Wed, 28 Dec 2011 23:14:23 +0000 (15:14 -0800)]
Merge "SipService: grab Wi-Fi lock only when necessary."
Irfan Sheriff [Wed, 28 Dec 2011 21:55:19 +0000 (13:55 -0800)]
Merge "clean up jni code"
Scott Main [Wed, 28 Dec 2011 18:36:01 +0000 (10:36 -0800)]
am
e231cd0a: am
0582da68: docs: add links for Galaxy Nexus driver
* commit '
e231cd0a0dd5fce60a0635d7a60233db432429dd':
docs: add links for Galaxy Nexus driver
Scott Main [Wed, 28 Dec 2011 18:34:03 +0000 (10:34 -0800)]
am
0582da68: docs: add links for Galaxy Nexus driver
* commit '
0582da680ed3d48bfd9d6ed550f39aa2177baf79':
docs: add links for Galaxy Nexus driver
Jesse Wilson [Wed, 28 Dec 2011 00:42:24 +0000 (16:42 -0800)]
Merge "Move the frameworks/base hostname verifier into libcore. Part 2/2"
Joe Fernandez [Thu, 22 Dec 2011 23:59:34 +0000 (15:59 -0800)]
am
201469f5: am
bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
* commit '
201469f54522436be79d4d6665721049bfc74320':
docs: Add developer guide cross-references, Project ACRE, round 4
Joe Fernandez [Thu, 22 Dec 2011 23:57:09 +0000 (15:57 -0800)]
am
bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
* commit '
bb7f590a5a539486de5127071c7ade8ec988d755':
docs: Add developer guide cross-references, Project ACRE, round 4
Joe Fernandez [Thu, 22 Dec 2011 23:55:00 +0000 (15:55 -0800)]
Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
Eric Laurent [Thu, 22 Dec 2011 23:54:38 +0000 (15:54 -0800)]
Merge "AudioService: simplified handler messages."
Robert Greenwalt [Thu, 22 Dec 2011 22:43:28 +0000 (14:43 -0800)]
Merge "Use shared connections over retries."
Roman Nurik [Thu, 22 Dec 2011 22:31:33 +0000 (14:31 -0800)]
am
38daf3f1: am
38ee0dae: Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
* commit '
38daf3f122ac48b20d48779322ffc1a0fb9a3eb9':
docs: Update App Widgets dev guide size discussion
Roman Nurik [Thu, 22 Dec 2011 22:29:25 +0000 (14:29 -0800)]
am
38ee0dae: Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
* commit '
38ee0dae2cf0ff1860973523e5cda6e38642e904':
docs: Update App Widgets dev guide size discussion
Roman Nurik [Thu, 22 Dec 2011 22:27:55 +0000 (14:27 -0800)]
Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
Jonathan Dixon [Thu, 22 Dec 2011 14:30:50 +0000 (06:30 -0800)]
Merge "Fix silly comment order error"
Irfan Sheriff [Wed, 21 Dec 2011 17:26:36 +0000 (09:26 -0800)]
Merge "p2p fixes"
Chet Haase [Wed, 21 Dec 2011 15:53:14 +0000 (07:53 -0800)]
Merge "Fix behavior of AnimationSet and fillBefore"
The Android Open Source Project [Wed, 21 Dec 2011 15:21:45 +0000 (07:21 -0800)]
am
7e4aa24c: Reconcile with ics-mr1-release
* commit '
7e4aa24c8701381f542a324df958907194285fdc':
The Android Open Source Project [Wed, 21 Dec 2011 15:19:20 +0000 (07:19 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ic9251f762e0356c65eff1798cd5897a502d7981e
The Android Automerger [Wed, 21 Dec 2011 01:27:07 +0000 (17:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 20 Dec 2011 21:11:53 +0000 (13:11 -0800)]
am
21cb1290: Reconcile with ics-mr1-release
* commit '
21cb1290b578a4bceac003c276c00911fcd6c9d4':
The Android Open Source Project [Tue, 20 Dec 2011 21:08:33 +0000 (13:08 -0800)]
Reconcile with ics-mr1-release
Change-Id: I123bd5ae61ab8c4f6de1a6640faf0bab89f6aa78
Chet Haase [Tue, 20 Dec 2011 18:49:02 +0000 (10:49 -0800)]
Merge "Make behavior of ABSOLUTE pivot values more intuitive"
Gilles Debunne [Tue, 20 Dec 2011 18:46:42 +0000 (10:46 -0800)]
Merge "Rationalize blinking cursor test."
John Wang [Tue, 20 Dec 2011 18:45:32 +0000 (10:45 -0800)]
am
c0139281: am
c892e177: Merge "Hide emergency call text if not support it." into ics-mr1
* commit '
c01392816fbb16ca76c738bc801f3b2c34548c06':
Hide emergency call text if not support it.
John Wang [Tue, 20 Dec 2011 18:43:13 +0000 (10:43 -0800)]
am
c892e177: Merge "Hide emergency call text if not support it." into ics-mr1
* commit '
c892e177c4f7a41e910c70f68d4e213589da1396':
Hide emergency call text if not support it.
John Wang [Tue, 20 Dec 2011 18:41:08 +0000 (10:41 -0800)]
Merge "Hide emergency call text if not support it." into ics-mr1
Chet Haase [Tue, 20 Dec 2011 18:37:14 +0000 (10:37 -0800)]
Merge "Fix ViewAnimator.getDisplayedChild() bug"
Chet Haase [Tue, 20 Dec 2011 18:36:55 +0000 (10:36 -0800)]
Merge "Minor small fixes to old Animation code and docs."
Glenn Kasten [Tue, 20 Dec 2011 18:29:49 +0000 (10:29 -0800)]
Merge "Remove dead code"
Tom Taylor [Tue, 20 Dec 2011 18:15:26 +0000 (10:15 -0800)]
Merge "Received MMS is not displayed properly with 'Avea' SIM Card"
Jonathan Dixon [Tue, 20 Dec 2011 16:17:43 +0000 (08:17 -0800)]
Merge "Remove misleading API council comments"
Chet Haase [Tue, 20 Dec 2011 02:02:23 +0000 (18:02 -0800)]
Merge "Fix AnimationDrawable double-start bug"
Bill Gruber [Tue, 20 Dec 2011 01:47:21 +0000 (17:47 -0800)]
am
c296892a: am
1d56f41c: Doc Fix: Sensors and Cameras
* commit '
c296892aa2dee5f9e0fee376a2b97a4fa06f3f88':
Doc Fix: Sensors and Cameras
Bill Gruber [Tue, 20 Dec 2011 01:45:24 +0000 (17:45 -0800)]
am
1d56f41c: Doc Fix: Sensors and Cameras
* commit '
1d56f41c9d1dcccf1faef343047375cb14799678':
Doc Fix: Sensors and Cameras
Eric Laurent [Tue, 20 Dec 2011 01:26:24 +0000 (17:26 -0800)]
Merge "audio effects: rename configure command"
Nick Pelly [Mon, 19 Dec 2011 23:53:10 +0000 (15:53 -0800)]
Merge "Rewrite NDEF parsing in Java, clean-up API."
Bart Sears [Sun, 18 Dec 2011 23:38:59 +0000 (15:38 -0800)]
Merge "Add glyphs for Vertical Text"
Scott Main [Sun, 18 Dec 2011 22:05:23 +0000 (14:05 -0800)]
am
3204c523: am
8f04ae36: docs: fix sidenav typo
* commit '
3204c52377ca508709cb66b24398af58ca32efdd':
docs: fix sidenav typo
Scott Main [Sun, 18 Dec 2011 22:03:30 +0000 (14:03 -0800)]
am
8f04ae36: docs: fix sidenav typo
* commit '
8f04ae361cd34fdaea41fbedefb85cff2c684e36':
docs: fix sidenav typo
Chet Haase [Sat, 17 Dec 2011 18:20:14 +0000 (10:20 -0800)]
Merge "De-allocate caches for large glyphs when trimming memory"
Hong Teng [Fri, 16 Dec 2011 23:17:46 +0000 (15:17 -0800)]
Merge "Fix for
5754998 testPerformanceTransitionWithEffectOverlapping test failed."