68558 Commits

Author SHA1 Message Date
Craig Mautner
c38358025d 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
9f77932422 Merge "Add test for signed/unsigned char bug (conversion)." 2012-02-28 21:01:36 -08:00
James Dong
5df6280557 Added permission check for all sensitive drm API calls
o all drm calls using a DecryptHandle now check the permission before proceeding

Change-Id: Ic992a991357876c6e4bfbfab4f5eec1fa0634a13
2012-02-28 18:50:44 -08:00
James Dong
ee31e56a16 Merge "Moves TimedTextDriver.h into include/media/stagefright/timedtext." 2012-02-28 18:49:34 -08:00
Fabrice Di Meglio
3fb824bae3 Fix bug #5217606 LocaleUtils constants TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE and TEXT_LAYOUT_DIRECTION_RTL_DO_NOT_USE should be renamed
- replace them by the View constants

Change-Id: I7c2bf0213319247d3db369b6f7c36771fdf3e509
2012-02-28 18:08:11 -08:00
Gilles Debunne
1b3d01de38 Merge "InputConnection is warned when finished" 2012-02-28 18:05:28 -08:00
satok
a6bae56fc5 Merge "Unblock IPC call in TextServicesManagerService" 2012-02-28 17:56:43 -08:00
Craig Mautner
343511c9ec Detect animation completions like we used to.
Previous approximations weren't indicating completion and windows weren't being layered correctly as a result.

Change-Id: I08fcd278485bb87dc10bca257b9f8073108753f3
2012-02-28 17:34:22 -08:00
Craig Mautner
ba64dfe872 debug
Change-Id: I1f496bb71068b6c3a09095c39fb04c9f4153e051
2012-02-28 17:34:21 -08:00
Bart Sears
1da4ce0699 Merge "Update AndroidEmoji to version 1.01" 2012-02-28 17:30:29 -08:00
Jake Hamby
0c49f03a04 Add support for CMAS warning notifications over CDMA.
Refactor SMS Cell Broadcast support to enable receiving CMAS warning
notifications over CDMA. The CellBroadcastReceiver app must also be
updated with the corresponding change. All cell broadcasts are now
delivered as a Parcelable SmsCbMessage object in the "message" extra
of the SMS_CB_RECEIVED_ACTION or SMS_EMERGENCY_CB_RECEIVED_ACTION,
instead of as a GSM/UMTS "pdu" byte array.

Existing functionality for ETWS and CMAS alerts over GSM/UMTS continues
to be supported using the new radio-technology independent SmsCbMessage
and related objects. Test cases are added to verify that valid and
invalid broadcast data is handled appropriately.

Unit testing discovered a bug in the BitwiseOutputStream utility class
used by the added test cases. When the BitwiseOutputStream object must be
expanded (in the private possExpand() method), the mEnd field is not
updated to the new array size. This causes a new array to be allocated
on every new write, and for all data beyond the original array allocation
to be replaced with zeroes. Fixed by adding a line to possExpand() to
update mEnd. Added a test case to BitwiseStreamsTest to verify the fix.
Besides the test cases, BitwiseOutputStream is only used by BearerData in
two places, both of which allocate a sufficient initial buffer. So the
bug in BitwiseOutputStream is not critical to fix for normal operation,
but should be fixed so that the test cases using it function correctly.

Bug: 5856308
Change-Id: Ie3e6af747976ce9b8a3e71e76fec71709cf86545
2012-02-28 16:49:17 -08:00
Glenn Kasten
86e3362f15 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
Gilles Debunne
8279570b22 Fix for broken build part 2. Update 16.txt too
Change-Id: I8609dd818a6e4059f9b149a8089d681ac2972d66
2012-02-28 16:36:45 -08:00
Gilles Debunne
c1a1a49540 Fix for broken build. update-api step missing.
Change-Id: Ia8d3c92825cfdca8b8eef1c1badd1b514ceef18e
2012-02-28 16:31:38 -08:00
Andreas Huber
4484bdd2f9 Separate the notion of "stop" from that of "release", i.e.
stop - means transition back to LOADED state and keeping the component
instance allocated.

release - means we get rid of the component completely.

Change-Id: I40ad01ce70821faaad43f57999249904f9144924
2012-02-28 15:54:51 -08:00
Robert Ly
c02859f6eb 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
e6c118b5d0 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
246a1bee9d am edfc6a0d: am f4994b3e: Merge "fix bug 5911175" into ics-mr1
* commit 'edfc6a0d709afdf75284ecfc1e680c27fda8b9a9':
2012-02-28 15:43:52 -08:00
Robert Ly
61a9a83ac0 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
edfc6a0d70 am f4994b3e: Merge "fix bug 5911175" into ics-mr1
* commit 'f4994b3eb03e1e772d7d46e8b6dcfc88593db792':
  fix bug 5911175
2012-02-28 15:39:55 -08:00
Robert Ly
40226da7ae am f4994b3e: Merge "fix bug 5911175" into ics-mr1
* commit 'f4994b3eb03e1e772d7d46e8b6dcfc88593db792':
  fix bug 5911175
2012-02-28 15:39:39 -08:00
Robert Ly
f4994b3eb0 Merge "fix bug 5911175" into ics-mr1 2012-02-28 15:37:21 -08:00
Gilles Debunne
3e804a615d Merge "Removed TextAlign in TextView" 2012-02-28 15:32:04 -08:00
George Mount
6012edec28 Add support for maxlength text fields to WebViewInputConnection.
Bug 6083776
 While WebKit limits the length of a field with maxlength, the
 InputConnection can get out of sync with it when it doesn't
 recognize that the characters haven't been changed. Adds
 maximum field length to WebViewInputConnection to limit the
 characters typed.
 WebKit Change: Ie02f82a3f5b3527c378938d93bac2dece802af26

Change-Id: I135871db7809e8dc28a3ad8d3aa852976a274555
2012-02-28 15:27:26 -08:00
Dianne Hackborn
b391f2e0b6 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
11f343c6b1 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
8097e1c567 Merge "Disable verbose NetworkStats logging." 2012-02-28 15:14:19 -08:00
Jeff Sharkey
e7bb71d269 Disable verbose NetworkStats logging.
Bug: 6076584
Change-Id: I4efcda2b474f623f4fe70db8b43b0aa69017d749
2012-02-28 15:13:08 -08:00
Dianne Hackborn
00e6fc4c73 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
4953ec1c71 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
a2e0e3b5f6 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
c221d6ec2f 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
27e20ccd9a Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 2012-02-28 15:01:05 -08:00
felipeal
d9f94416fc 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
dcd55a015c 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
973481d667 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
Dianne Hackborn
5c607433e3 Fix issue #6073913: onActivityResult() not getting called...
...if the process is killed and restarted

Try to ensure that in all cases we deliver an activity result if one
was requested.

Change-Id: Id43e830d2ee782f98ed1e3b68e5e16f3258d4ad8
2012-02-28 14:45:23 -08:00
Michael Jurka
a267f0a707 Merge "Add shortcut for voice search" 2012-02-28 14:40:33 -08:00
Michael Jurka
7a3489552c Add shortcut for voice search
On phones with soft nav bar, make long press on
home launch a voice search intent

Change-Id: I69840a96a08524a76e33a306b799222c879db095
2012-02-28 14:37:35 -08:00
Fabrice Di Meglio
ff40ab7a41 Fix bug #5180841 TextLayoutCache needs to support Indic
- add Tamil and Devanagari shaping support

Change-Id: I331ec52cd1987e157100deb699db27f855881c32
2012-02-28 14:35:48 -08:00
James Dong
2f16d7eae1 Merge "Fix API issues in DrmRights class." 2012-02-28 14:34:02 -08:00
James Dong
e512ad5089 Merge "Deprecate default constructor for classes that should have been meant to be interfaces" 2012-02-28 14:33:19 -08:00
felipeal
635d492d59 am 4bcc9108: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '4bcc910817c694c8d8b20e39a5ff42c584af1d49':
2012-02-28 14:09:43 -08:00
felipeal
96236bc8d9 am fa73815e: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit 'fa73815e1d953e67c635877440e717dc84465d97':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
2012-02-28 14:07:26 -08:00
felipeal
4bcc910817 am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit 'e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
2012-02-28 14:05:23 -08:00
felipeal
fa73815e1d am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit 'e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
2012-02-28 14:04:20 -08:00
Eric Fischer
6fa13b5a02 Merge "Import translations. DO NOT MERGE" 2012-02-28 13:56:29 -08:00
Eric Fischer
cb4c17d27a Merge "Import translations. DO NOT MERGE" 2012-02-28 13:55:24 -08:00
Jean-Baptiste Queru
ccd08b8de9 am e939edb5: am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit 'e939edb5b4e991998ae8219b03d75c10cdc765cb':
  Fixes update of extras Bundle in new Locations for GPS Provider
2012-02-28 13:53:17 -08:00
felipeal
e4ef9b1ac2 DO NOT MERGE
(from master: Fixed minor typo on Javadoc)

Change-Id: I7d62e37011a7fd4d792fdfe5bd62022a850303a6
2012-02-28 13:47:15 -08:00