OSDN Git Service
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:33 +0000 (15:35 -0800)]
am
dbc591e2: am
c69d6134: am
6ae4fe94: am
9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
* commit '
dbc591e27686486c732fca2f94fde645e3487b7a':
Adds documentation for ContentResolver notifyChange()
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:25 +0000 (15:35 -0800)]
am
9de7793b: am
4f906362: am
97348431: am
704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
* commit '
9de7793b425be89889412f3a86466d7b19055c3c':
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:23 +0000 (15:35 -0800)]
am
715c78b9: am
225eec8d: am
f9d4ba77: am
69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
* commit '
715c78b933f8dec04882ebb73acd61fdd42c6c64':
stagefright aacenc: Safeguard against overwriting bits
Eric Fischer [Thu, 1 Mar 2012 23:32:24 +0000 (15:32 -0800)]
am
4917bc10: am
d31da0a6: am
fb393f8b: Mark configuration strings as not translatable.
* commit '
4917bc104da1725d7ba093713de3802dec1515e5':
Eric Fischer [Thu, 1 Mar 2012 23:32:22 +0000 (15:32 -0800)]
am
b145e363: (-s ours) am
ba62da99: am
fb393f8b: Mark configuration strings as not translatable.
* commit '
b145e363ff4e00048cdc9035300a6db05aa0fbb5':
Mark configuration strings as not translatable.
Jim Miller [Thu, 1 Mar 2012 23:01:53 +0000 (15:01 -0800)]
Merge "Fix
5797764: fix crash on tablets"
Jim Miller [Thu, 1 Mar 2012 22:30:21 +0000 (14:30 -0800)]
Merge "Fix
5797764: don't hold PowerManager lock when changing native brightness"
Steve Block [Thu, 1 Mar 2012 22:21:25 +0000 (14:21 -0800)]
Merge "Prevent a 'TODO' from appearing in the JavaDoc"
Andreas Huber [Thu, 1 Mar 2012 20:41:10 +0000 (12:41 -0800)]
Merge "Instead of hardcoding OMX component names in our code, support"
Romain Guy [Thu, 1 Mar 2012 20:11:59 +0000 (12:11 -0800)]
Merge "Small tweak to Canvas.drawPath() GL implementation"
Teng-Hui Zhu [Thu, 1 Mar 2012 19:32:59 +0000 (11:32 -0800)]
Merge "Clean up Surface Texture on Java side"
Andreas Huber [Wed, 29 Feb 2012 23:47:17 +0000 (15:47 -0800)]
Instead of hardcoding OMX component names in our code, support
a config file instead.
Change-Id: I5835903ab9f1c4a22ccc605ca99ed966767adf57
John Wang [Thu, 1 Mar 2012 18:52:47 +0000 (10:52 -0800)]
Merge "[maguro] Add Cheers' MCCMNC in SIMRecords.java"
Wink Saville [Thu, 1 Mar 2012 18:28:56 +0000 (10:28 -0800)]
Merge "If no NITZ information use Country Code to set TimeZone."
Jeff Brown [Thu, 1 Mar 2012 18:23:51 +0000 (10:23 -0800)]
Merge "Improve documentation of SQLite debugging options."
Eric Laurent [Thu, 1 Mar 2012 18:17:21 +0000 (10:17 -0800)]
Merge "renamed audio policy output flag."
Alex Sakhartchouk [Thu, 1 Mar 2012 17:43:43 +0000 (09:43 -0800)]
Merge "Allocation sampling api prototypes."
Roman Nurik [Thu, 1 Mar 2012 17:26:24 +0000 (09:26 -0800)]
am
62b4e4a8: am
86ca108c: am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
62b4e4a83ea949537ca4bb1f56074d63a17bf87a':
Roman Nurik [Thu, 1 Mar 2012 17:08:33 +0000 (09:08 -0800)]
am
b96ad49a: am
c47369d7: am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
b96ad49a3a898b741f7c4d6854e599116546e2ac':
docs: Android Design downloads section, linkable H2s.
Robert Greenwalt [Thu, 1 Mar 2012 16:13:24 +0000 (08:13 -0800)]
Merge "Don't forget to turn off mobile_dun"
satok [Thu, 1 Mar 2012 08:25:03 +0000 (00:25 -0800)]
Merge "Handle sentence level spell checking hidden APIs"
Wu-cheng Li [Thu, 1 Mar 2012 06:49:10 +0000 (22:49 -0800)]
Merge "Use SINGLE_TOP and CLEAR_TOP when starting camera from lock scren."
Jeff Brown [Thu, 1 Mar 2012 05:29:22 +0000 (21:29 -0800)]
Merge "Externalize more SQLite configuration options."
Irfan Sheriff [Thu, 1 Mar 2012 03:33:06 +0000 (19:33 -0800)]
Merge "Improve Wi-Fi hand-off"
Romain Guy [Thu, 1 Mar 2012 03:16:15 +0000 (19:16 -0800)]
Merge "Full implementation of Canvas.drawPath()"
Fabrice Di Meglio [Thu, 1 Mar 2012 02:45:54 +0000 (18:45 -0800)]
Merge "Fix bug #
3389545 android:ellipsize="end" doesn't work without using android:singleLine="true" which is deprecated"
Gilles Debunne [Thu, 1 Mar 2012 01:32:20 +0000 (17:32 -0800)]
Merge "Invalidate text display list on scroll"
Michael Jurka [Thu, 1 Mar 2012 01:30:05 +0000 (17:30 -0800)]
Merge "Fix alpha when swiping recents on tablets"
Jeff Brown [Thu, 1 Mar 2012 01:06:23 +0000 (17:06 -0800)]
Merge "Don't throw if sqlite3_finalize returns an error."
Jeff Brown [Thu, 1 Mar 2012 01:06:08 +0000 (17:06 -0800)]
Merge "Refactor SQLiteOpenHelper."
Andrew Hsieh [Thu, 1 Mar 2012 00:41:55 +0000 (16:41 -0800)]
Merge "Fixed several 64-bit porting issues"
James Dong [Thu, 1 Mar 2012 00:32:10 +0000 (16:32 -0800)]
Merge "Added permission check for all sensitive drm API calls"
Fabrice Di Meglio [Thu, 1 Mar 2012 00:20:24 +0000 (16:20 -0800)]
Merge "Fix bug #
5616520 When the device is set to Arabic, and the email application is launched, the guided text is not displayed"
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:51:25 +0000 (15:51 -0800)]
am
c69d6134: am
6ae4fe94: am
9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
* commit '
c69d61343913848b467022ef63f2c84cbc5ec34b':
Adds documentation for ContentResolver notifyChange()
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:51:23 +0000 (15:51 -0800)]
am
4f906362: am
97348431: am
704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
* commit '
4f9063622415ea083bbd639af06e98065ce7176d':
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:51:19 +0000 (15:51 -0800)]
am
225eec8d: am
f9d4ba77: am
69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
* commit '
225eec8d2a1b63dfb57bcdcf3a72ab755f0e5525':
stagefright aacenc: Safeguard against overwriting bits
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:47:38 +0000 (15:47 -0800)]
am
6ae4fe94: am
9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
* commit '
6ae4fe945b41d4bcb3ba7d931e34d6ef184b8b45':
Adds documentation for ContentResolver notifyChange()
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:47:35 +0000 (15:47 -0800)]
am
97348431: am
704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
* commit '
9734843102c074c56ac72e221db0f51ae2fa79ec':
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:47:32 +0000 (15:47 -0800)]
am
f9d4ba77: am
69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
* commit '
f9d4ba77f45d8f0efe97abb28247cbca12836dca':
stagefright aacenc: Safeguard against overwriting bits
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:44:34 +0000 (15:44 -0800)]
am
9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
* commit '
9303919d7d837dedf16f09ace0013e62670568e7':
Adds documentation for ContentResolver notifyChange()
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:44:31 +0000 (15:44 -0800)]
am
704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
* commit '
704131cb7e4f9cc682ea57ed569375f9f289368e':
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:44:28 +0000 (15:44 -0800)]
am
69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
* commit '
69aae36e900cf7114c5895618747906951a11730':
stagefright aacenc: Safeguard against overwriting bits
Glenn Kasten [Wed, 29 Feb 2012 22:59:08 +0000 (14:59 -0800)]
Merge "Shorten thread names"
Glenn Kasten [Wed, 29 Feb 2012 22:56:30 +0000 (14:56 -0800)]
Merge "Prepare for threadLoop merge - active tracks"
Glenn Kasten [Wed, 29 Feb 2012 22:45:25 +0000 (14:45 -0800)]
Merge "AudioRecord const methods"
Glenn Kasten [Wed, 29 Feb 2012 22:44:39 +0000 (14:44 -0800)]
Merge "Update AudioFlinger comments"
Glenn Kasten [Wed, 29 Feb 2012 22:43:19 +0000 (14:43 -0800)]
Merge "Pull in declaration of effectChains to inner block"
Jean-Baptiste Queru [Wed, 29 Feb 2012 22:38:57 +0000 (14:38 -0800)]
Merge "Adds documentation for ContentResolver notifyChange()"
Adam Powell [Wed, 29 Feb 2012 22:26:24 +0000 (14:26 -0800)]
Merge "Fix simple_list_item_multiple_choice to use correct size and spacing."
Jean-Baptiste Queru [Wed, 29 Feb 2012 22:24:52 +0000 (14:24 -0800)]
Merge changes I46c81dba,If1f40e9c,I652eaaa5
* changes:
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
Jean-Baptiste Queru [Wed, 29 Feb 2012 22:23:38 +0000 (14:23 -0800)]
Merge "stagefright aacenc: Safeguard against overwriting bits"
Christopher Tate [Wed, 29 Feb 2012 22:08:46 +0000 (14:08 -0800)]
Merge "Merge: Introduce UpdateLocks"
Svetoslav Ganov [Wed, 29 Feb 2012 22:08:13 +0000 (14:08 -0800)]
Merge "Update to allow passing empty string in a binding."
Jake Hamby [Wed, 29 Feb 2012 22:04:48 +0000 (14:04 -0800)]
Merge "Revert "Add support for CMAS warning notifications over CDMA." I'll submit again when the app change is ready."
Eric Fischer [Wed, 29 Feb 2012 21:30:51 +0000 (13:30 -0800)]
am
d31da0a6: am
fb393f8b: Mark configuration strings as not translatable.
* commit '
d31da0a670a60722339faa18e1147adb9c14532d':
Eric Fischer [Wed, 29 Feb 2012 21:28:52 +0000 (13:28 -0800)]
am
ba62da99: am
fb393f8b: Mark configuration strings as not translatable.
* commit '
ba62da99666c9ca590cde49ff00c06d3d50ca0a7':
Mark configuration strings as not translatable.
Eric Fischer [Wed, 29 Feb 2012 21:26:13 +0000 (13:26 -0800)]
am
fb393f8b: Mark configuration strings as not translatable.
* commit '
fb393f8bd79602c933dc829bd36070dd78be2872':
Mark configuration strings as not translatable.
Eric Fischer [Wed, 29 Feb 2012 21:26:08 +0000 (13:26 -0800)]
am
fb393f8b: Mark configuration strings as not translatable.
* commit '
fb393f8bd79602c933dc829bd36070dd78be2872':
Mark configuration strings as not translatable.
Eric Fischer [Wed, 29 Feb 2012 21:21:43 +0000 (13:21 -0800)]
Merge "Import translations. DO NOT MERGE"
Roman Nurik [Wed, 29 Feb 2012 20:49:31 +0000 (12:49 -0800)]
am
86ca108c: am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
86ca108c65c3f8400e750d639b71d6a3cef5b600':
Roman Nurik [Wed, 29 Feb 2012 20:45:16 +0000 (12:45 -0800)]
am
c47369d7: am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
c47369d7c5d3a588d7b0c655878f0bc7dd2ffedc':
docs: Android Design downloads section, linkable H2s.
Roman Nurik [Wed, 29 Feb 2012 20:43:29 +0000 (12:43 -0800)]
am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
docs: Android Design downloads section, linkable H2s.
Roman Nurik [Wed, 29 Feb 2012 20:42:39 +0000 (12:42 -0800)]
am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
docs: Android Design downloads section, linkable H2s.
Jake Hamby [Wed, 29 Feb 2012 20:41:38 +0000 (12:41 -0800)]
Merge "Add support for CMAS warning notifications over CDMA."
Fabrice Di Meglio [Wed, 29 Feb 2012 20:38:44 +0000 (12:38 -0800)]
Merge "Fix bug #
5180841 TextLayoutCache needs to support Indic"
Fabrice Di Meglio [Wed, 29 Feb 2012 20:37:13 +0000 (12:37 -0800)]
Merge "Fix bug #
5217606 LocaleUtils constants TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE and TEXT_LAYOUT_DIRECTION_RTL_DO_NOT_USE should be renamed"
Jeff Sharkey [Wed, 29 Feb 2012 20:29:22 +0000 (12:29 -0800)]
Merge "Wrap StrictMode changes in try/finally."
Fabrice Di Meglio [Wed, 29 Feb 2012 20:29:12 +0000 (12:29 -0800)]
Merge "Fix bug #
5371909 Hebrew & Arabic mails are sent as LTR intead of RTL"
Mathias Agopian [Wed, 29 Feb 2012 20:10:03 +0000 (12:10 -0800)]
Merge "get rid of MemoryHeapPmem"
Glenn Kasten [Wed, 29 Feb 2012 19:32:42 +0000 (11:32 -0800)]
Merge "Mark similar and different sections in threadLoop"
Gilles Debunne [Wed, 29 Feb 2012 18:59:56 +0000 (10:59 -0800)]
Merge "Vibrate on long press, even out of text"
Andreas Huber [Wed, 29 Feb 2012 17:20:24 +0000 (09:20 -0800)]
Merge "Separate the notion of "stop" from that of "release", i.e."
George Mount [Wed, 29 Feb 2012 15:17:12 +0000 (07:17 -0800)]
Merge "Add support for maxlength text fields to WebViewInputConnection."
Craig Mautner [Wed, 29 Feb 2012 14:18:23 +0000 (06:18 -0800)]
Merge changes I08fcd278,I1f496bb7
* changes:
Detect animation completions like we used to. Previous approximations weren't indicating completion and windows weren't being layered correctly as a result.
debug
Stephen Hines [Wed, 29 Feb 2012 05:01:36 +0000 (21:01 -0800)]
Merge "Add test for signed/unsigned char bug (conversion)."
James Dong [Wed, 29 Feb 2012 02:49:34 +0000 (18:49 -0800)]
Merge "Moves TimedTextDriver.h into include/media/stagefright/timedtext."
Gilles Debunne [Wed, 29 Feb 2012 02:05:28 +0000 (18:05 -0800)]
Merge "InputConnection is warned when finished"
satok [Wed, 29 Feb 2012 01:56:43 +0000 (17:56 -0800)]
Merge "Unblock IPC call in TextServicesManagerService"
Bart Sears [Wed, 29 Feb 2012 01:30:29 +0000 (17:30 -0800)]
Merge "Update AndroidEmoji to version 1.01"
Glenn Kasten [Tue, 28 Feb 2012 20:30:08 +0000 (12:30 -0800)]
Shorten thread names
prctl(PR_SET_NAME) limits to 15 characters. Before we had names like
"Binder Thread #" and the counter was cut off :-( Also remove redundant
"thread" at end of name; it's always a thread.
Change-Id: I1f99c2730ba0787ed9b59c15914356cddf698e2f
Robert Ly [Tue, 28 Feb 2012 23:48:12 +0000 (15:48 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:45:40 +0000 (15:45 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:43:52 +0000 (15:43 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:42:32 +0000 (15:42 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:39:55 +0000 (15:39 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:39:39 +0000 (15:39 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:37:21 +0000 (15:37 -0800)]
Merge "fix bug
5911175" into ics-mr1
Gilles Debunne [Tue, 28 Feb 2012 23:32:04 +0000 (15:32 -0800)]
Merge "Removed TextAlign in TextView"
Dianne Hackborn [Tue, 28 Feb 2012 23:19:19 +0000 (15:19 -0800)]
am
11f343c6: am
c221d6ec: am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
11f343c6b1b6a420c0a375edbb7c35d2fdb32482':
Dianne Hackborn [Tue, 28 Feb 2012 23:16:20 +0000 (15:16 -0800)]
am
c221d6ec: am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
c221d6ec2fbaa73f82cd219e2d5ab078697070ab':
Jeff Sharkey [Tue, 28 Feb 2012 23:14:19 +0000 (15:14 -0800)]
Merge "Disable verbose NetworkStats logging."
Dianne Hackborn [Tue, 28 Feb 2012 23:10:39 +0000 (15:10 -0800)]
am
4953ec1c: am
a2e0e3b5: am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
4953ec1c71c4c2c134da2c969945c0d8b4fcb03c':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:07:43 +0000 (15:07 -0800)]
am
a2e0e3b5: am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
a2e0e3b5f63dc741fd5e54f45f8dde1a3cb58c6c':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:03:28 +0000 (15:03 -0800)]
am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:03:18 +0000 (15:03 -0800)]
am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:01:04 +0000 (15:01 -0800)]
Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
felipeal [Tue, 28 Feb 2012 22:59:29 +0000 (14:59 -0800)]
am
635d492d: (-s ours) am
4bcc9108: am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
635d492d5918fe11a3a9bb9d9a87839a8331d34b':
felipeal [Tue, 28 Feb 2012 22:59:26 +0000 (14:59 -0800)]
am
96236bc8: (-s ours) am
fa73815e: am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
96236bc8d93efc0573a18b87699d56a3ed8c0b0b':
DO NOT MERGE (from master: Fixed minor typo on Javadoc)
Jean-Baptiste Queru [Tue, 28 Feb 2012 22:59:18 +0000 (14:59 -0800)]
am
ccd08b8d: am
e939edb5: am
f418738c: am
d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit '
ccd08b8de9dc4c9cfaee93cbbcc7053cc9e8d96f':
Fixes update of extras Bundle in new Locations for GPS Provider
Michael Jurka [Tue, 28 Feb 2012 22:40:33 +0000 (14:40 -0800)]
Merge "Add shortcut for voice search"