Commit Graph

45976 Commits

Author SHA1 Message Date
James Dong
0ae12e7604 Merge "Added permission check for all sensitive drm API calls" 2012-02-29 16:32:10 -08:00
Fabrice Di Meglio
643af24b80 Merge "Fix bug #5616520 When the device is set to Arabic, and the email application is launched, the guided text is not displayed" 2012-02-29 16:20:24 -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
Adam Powell
91fe608f1c Merge "Fix simple_list_item_multiple_choice to use correct size and spacing." 2012-02-29 14:26:24 -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
b629e9865b Merge "Import translations. DO NOT MERGE" 2012-02-29 13:21:43 -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
Dianne Hackborn
7909575b8d am 11f343c6: am c221d6ec: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1
* commit '11f343c6b1b6a420c0a375edbb7c35d2fdb32482':
2012-02-28 15:19:19 -08:00
Dianne Hackborn
da2e9896ee am c221d6ec: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1
* commit 'c221d6ec2fbaa73f82cd219e2d5ab078697070ab':
2012-02-28 15:16:20 -08:00
Jeff Sharkey
c38ba57c0d Merge "Disable verbose NetworkStats logging." 2012-02-28 15:14:19 -08:00
Dianne Hackborn
15009e3d7b 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...
2012-02-28 15:10:39 -08:00
Dianne Hackborn
731757ccbe am a2e0e3b5: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1
* commit 'a2e0e3b5f63dc741fd5e54f45f8dde1a3cb58c6c':
  Fix issue #6073913: onActivityResult() not getting called...
2012-02-28 15:07:43 -08:00
Dianne Hackborn
a196c9116e am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1
* commit '27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
  Fix issue #6073913: onActivityResult() not getting called...
2012-02-28 15:03:28 -08:00
Dianne Hackborn
173e455381 am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1
* commit '27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
  Fix issue #6073913: onActivityResult() not getting called...
2012-02-28 15:03:18 -08:00
Dianne Hackborn
0003f917f0 Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 2012-02-28 15:01:05 -08:00
felipeal
ee614e7017 am 635d492d: (-s ours) am 4bcc9108: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '635d492d5918fe11a3a9bb9d9a87839a8331d34b':
2012-02-28 14:59:29 -08:00
felipeal
d378afb386 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)
2012-02-28 14:59:26 -08:00
Jean-Baptiste Queru
9f841a4f8f 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
2012-02-28 14:59:18 -08:00
Michael Jurka
564a380684 Merge "Add shortcut for voice search" 2012-02-28 14:40:33 -08:00
James Dong
09804e47e1 Merge "Fix API issues in DrmRights class." 2012-02-28 14:34:02 -08:00