Commit Graph

46093 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
82c3852fd5 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
2012-02-29 15:44:31 -08:00
Jean-Baptiste Queru
c9b107f365 am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
* commit '69aae36e900cf7114c5895618747906951a11730':
  stagefright aacenc: Safeguard against overwriting bits
2012-02-29 15:44:28 -08:00
Jean-Baptiste Queru
c31e9aa9cf Merge "DRM framwork bug fix: add an API to release resources" 2012-02-29 15:12:48 -08:00
Jean-Baptiste Queru
d02344babf Merge "Set width of spinner's dropdown to fit on device" 2012-02-29 15:09:17 -08:00
Glenn Kasten
67f8b5228e Merge "Shorten thread names" 2012-02-29 14:59:08 -08:00
Glenn Kasten
47e864ebe6 Merge "Prepare for threadLoop merge - active tracks" 2012-02-29 14:56:30 -08:00
Glenn Kasten
7d4ecebdeb Merge "AudioRecord const methods" 2012-02-29 14:45:25 -08:00
Glenn Kasten
b75a7e6e26 Merge "Update AudioFlinger comments" 2012-02-29 14:44:39 -08:00
Glenn Kasten
053a6b09dc Merge "Pull in declaration of effectChains to inner block" 2012-02-29 14:43:19 -08:00
Jean-Baptiste Queru
1f26fe2497 Merge "Adds documentation for ContentResolver notifyChange()" 2012-02-29 14:38:59 -08:00
Adam Powell
91fe608f1c Merge "Fix simple_list_item_multiple_choice to use correct size and spacing." 2012-02-29 14:26:24 -08:00
Jean-Baptiste Queru
35d19b4773 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
2012-02-29 14:24:52 -08:00
Jean-Baptiste Queru
f49cfe3daa Merge "stagefright aacenc: Safeguard against overwriting bits" 2012-02-29 14:23:38 -08:00
Christopher Tate
5090d0c4f4 Merge "Merge: Introduce UpdateLocks" 2012-02-29 14:08:46 -08:00
Svetoslav Ganov
e2c15c2520 Merge "Update to allow passing empty string in a binding." 2012-02-29 14:08:13 -08:00
Jake Hamby
74e4f5c7ee Merge "Revert "Add support for CMAS warning notifications over CDMA." I'll submit again when the app change is ready." 2012-02-29 14:04:48 -08:00
Eric Fischer
1d58e77773 am d31da0a6: am fb393f8b: Mark configuration strings as not translatable.
* commit 'd31da0a670a60722339faa18e1147adb9c14532d':
2012-02-29 13:30:51 -08:00
Eric Fischer
4cd9be547f am ba62da99: am fb393f8b: Mark configuration strings as not translatable.
* commit 'ba62da99666c9ca590cde49ff00c06d3d50ca0a7':
  Mark configuration strings as not translatable.
2012-02-29 13:28:52 -08:00
Eric Fischer
3441f34a79 am fb393f8b: Mark configuration strings as not translatable.
* commit 'fb393f8bd79602c933dc829bd36070dd78be2872':
  Mark configuration strings as not translatable.
2012-02-29 13:26:13 -08:00
Eric Fischer
2d31bdb4b8 am fb393f8b: Mark configuration strings as not translatable.
* commit 'fb393f8bd79602c933dc829bd36070dd78be2872':
  Mark configuration strings as not translatable.
2012-02-29 13:26:08 -08:00
Eric Fischer
b629e9865b Merge "Import translations. DO NOT MERGE" 2012-02-29 13:21:43 -08:00
Roman Nurik
cb372fd8db am 86ca108c: am a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '86ca108c65c3f8400e750d639b71d6a3cef5b600':
2012-02-29 12:49:31 -08:00
Roman Nurik
4750f8c706 am c47369d7: am a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit 'c47369d7c5d3a588d7b0c655878f0bc7dd2ffedc':
  docs: Android Design downloads section, linkable H2s.
2012-02-29 12:45:16 -08:00
Roman Nurik
9ab9e59b85 am a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit 'a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
  docs: Android Design downloads section, linkable H2s.
2012-02-29 12:43:29 -08:00
Roman Nurik
9553ec0540 am a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit 'a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
  docs: Android Design downloads section, linkable H2s.
2012-02-29 12:42:39 -08:00
Jake Hamby
acf4e347b0 Merge "Add support for CMAS warning notifications over CDMA." 2012-02-29 12:41:38 -08:00
Fabrice Di Meglio
51fddafd13 Merge "Fix bug #5180841 TextLayoutCache needs to support Indic" 2012-02-29 12:38:44 -08:00
Fabrice Di Meglio
d5323a9032 Merge "Fix bug #5217606 LocaleUtils constants TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE and TEXT_LAYOUT_DIRECTION_RTL_DO_NOT_USE should be renamed" 2012-02-29 12:37:13 -08:00
Jeff Sharkey
b5cd6723ee Merge "Wrap StrictMode changes in try/finally." 2012-02-29 12:29:22 -08:00
Fabrice Di Meglio
8635dfbddc Merge "Fix bug #5371909 Hebrew & Arabic mails are sent as LTR intead of RTL" 2012-02-29 12:29:12 -08:00
Mathias Agopian
9e20db8073 Merge "get rid of MemoryHeapPmem" 2012-02-29 12:10:03 -08:00
Glenn Kasten
93d76e6129 Merge "Mark similar and different sections in threadLoop" 2012-02-29 11:32:42 -08:00
Gilles Debunne
8db79079f7 Merge "Vibrate on long press, even out of text" 2012-02-29 10:59:56 -08:00
Andreas Huber
38ece2c8ea Merge "Separate the notion of "stop" from that of "release", i.e." 2012-02-29 09:20:25 -08:00
George Mount
bc767a7e55 Merge "Add support for maxlength text fields to WebViewInputConnection." 2012-02-29 07:17:12 -08:00
Craig Mautner
83dfb06d73 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
2012-02-29 06:18:23 -08:00
Stephen Hines
5a8a89a8a6 Merge "Add test for signed/unsigned char bug (conversion)." 2012-02-28 21:01:36 -08:00
James Dong
aa806befaf Merge "Moves TimedTextDriver.h into include/media/stagefright/timedtext." 2012-02-28 18:49:34 -08:00
Gilles Debunne
ab2acab520 Merge "InputConnection is warned when finished" 2012-02-28 18:05:28 -08:00
satok
5a0f8ef36a Merge "Unblock IPC call in TextServicesManagerService" 2012-02-28 17:56:43 -08:00
Bart Sears
674ecfeda2 Merge "Update AndroidEmoji to version 1.01" 2012-02-28 17:30:29 -08:00
Glenn Kasten
102d539a4c 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
2012-02-28 16:38:09 -08:00
Robert Ly
08a79a8c73 am 246a1bee: am edfc6a0d: am f4994b3e: Merge "fix bug 5911175" into ics-mr1
* commit '246a1bee9d5db1db3c91e0886b514598763193dd':
2012-02-28 15:48:12 -08:00
Robert Ly
ccc9c443d7 am 61a9a83a: am 40226da7: am f4994b3e: Merge "fix bug 5911175" into ics-mr1
* commit '61a9a83ac09246f815806fa4f64cc65a7e876f96':
  fix bug 5911175
2012-02-28 15:45:40 -08:00
Robert Ly
8d0932dba0 am edfc6a0d: am f4994b3e: Merge "fix bug 5911175" into ics-mr1
* commit 'edfc6a0d709afdf75284ecfc1e680c27fda8b9a9':
2012-02-28 15:43:52 -08:00
Robert Ly
05e2153a00 am 40226da7: am f4994b3e: Merge "fix bug 5911175" into ics-mr1
* commit '40226da7aeb705fb823517f74739bf2f25fa86f3':
  fix bug 5911175
2012-02-28 15:42:32 -08:00
Robert Ly
b8dea50c14 am f4994b3e: Merge "fix bug 5911175" into ics-mr1
* commit 'f4994b3eb03e1e772d7d46e8b6dcfc88593db792':
  fix bug 5911175
2012-02-28 15:39:55 -08:00
Robert Ly
5cecb55714 am f4994b3e: Merge "fix bug 5911175" into ics-mr1
* commit 'f4994b3eb03e1e772d7d46e8b6dcfc88593db792':
  fix bug 5911175
2012-02-28 15:39:39 -08:00
Robert Ly
b39e385b97 Merge "fix bug 5911175" into ics-mr1 2012-02-28 15:37:21 -08:00
Gilles Debunne
8ac1332a66 Merge "Removed TextAlign in TextView" 2012-02-28 15:32:04 -08:00