68739 Commits

Author SHA1 Message Date
Jeff Sharkey
6ea80061ff Merge "Wrap StrictMode changes in try/finally." 2012-02-29 12:29:22 -08:00
Fabrice Di Meglio
6e0e6f2eb5 Merge "Fix bug #5371909 Hebrew & Arabic mails are sent as LTR intead of RTL" 2012-02-29 12:29:12 -08:00
Jeff Sharkey
6bff62c2fd Wrap StrictMode changes in try/finally.
Bug: 6091030
Change-Id: I2614f8bb30203e00953b1978bbcaf24d84d0397b
2012-02-29 12:26:36 -08:00
Roman Nurik
a53b3bfaad docs: Android Design downloads section, linkable H2s.
Change-Id: I4ed3006117efd740ff5f3bc93df2ac75c2dfd2f9
2012-02-29 12:15:32 -08:00
Mathias Agopian
06dd67e305 Merge "get rid of MemoryHeapPmem" 2012-02-29 12:10:03 -08:00
Glenn Kasten
3c4f0dc3bc Pull in declaration of effectChains to inner block
Change-Id: I09eacf72124942abd604132b9f4e774b1236fcf3
2012-02-29 11:49:50 -08:00
Glenn Kasten
e70583e629 mSuspend comments and usage
Emphasize that playbackthread::mSuspend is a counter, not a bool

Change-Id: I7188e56814e1c54dbc65e560f3627f138257d644
2012-02-29 11:36:54 -08:00
Glenn Kasten
23704d3ae8 Merge "Mark similar and different sections in threadLoop" 2012-02-29 11:32:42 -08:00
Fabrice Di Meglio
cd4161b134 Fix bug #5371909 Hebrew & Arabic mails are sent as LTR intead of RTL
- make paragraphs aware of text direction

Change-Id: I0b0cf5a47c7da870dea836cb6150aa83e9de0e90
2012-02-29 11:15:07 -08:00
Gilles Debunne
f17981b33b Merge "Vibrate on long press, even out of text" 2012-02-29 10:59:56 -08:00
Alex Yakavenka
e7af59b375 Telephony: Remove SimCard and RuimCard
Remove notions of SimCard and RuimCard since they don't make sense
in the world of Uicc cards where each card can have multiple
3gpp and 3gpp2 subscriptions.

This change prepares code for the introduction of Uicc cards.

Change-Id: Ibab13004604f829328b73c177669b89ef97d3f25
2012-02-29 10:18:07 -08:00
Glenn Kasten
bea6b95228 Mark similar and different sections in threadLoop
Most of these comments will be removed after the threadLoop merge.

Note: the trivial change in assignments to mixBufferSize, and the
comments about "tracks to remove" is to make them all identical.

Change-Id: I3b1a33a7f2cd12ad557a1986bb71f6171161974a
2012-02-29 09:38:15 -08:00
Andreas Huber
0c9aa1b6fc Merge "Separate the notion of "stop" from that of "release", i.e." 2012-02-29 09:20:25 -08:00
George Mount
b290caafa7 Merge "Add support for maxlength text fields to WebViewInputConnection." 2012-02-29 07:17:12 -08:00
Glenn Kasten
f2218b7549 Update AudioFlinger comments
Add comments to enum mixer_state
Note side-effect of lockEffectChains_l
Fix a typo

Change-Id: Ibd51678bac2193201cbcbe081ff5664046fbc494
2012-02-29 07:01:44 -08:00
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
Wu-cheng Li
75e1ce6335 Use SINGLE_TOP and CLEAR_TOP when starting camera from lock scren.
Add these flags so there is no need to press back key twice to
exit the camera if users slide to camera twice.

bug:6070281

Change-Id: Iadf6ab2798cf9381bc9dc761920f46b022fb6bb8
2012-02-29 21:41:54 +08:00
Stephen Hines
9f77932422 Merge "Add test for signed/unsigned char bug (conversion)." 2012-02-28 21:01:36 -08:00
Kei Takahashi
6225df0103 DRM framwork bug fix: add an API to release resources
When DrmManagerClient object is created and released many times,
the process suddenly crashes.
The case can happen when we make many thumbnails of
DRM-encrypted contents.

The problem is caused by shortage of file descriptors.
DrmManagerClient releases references of file descriptors
only when GC runs. So file descriptors are kept long time
even after the reference of DrmManagerClient are released.

By introducing DrmManagerClient#release() API,
the problem is solved. An application call this API
when we no longer need to use DrmManagerClient object.

Changes are made by SEMC and Sony.

Change-Id: Ie0bbc29cc33872449824285a8d67b1c3cdd8082b
2012-02-29 12:59:53 +09: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
SeongJae Park
95148495fc Set width of spinner's dropdown to fit on device
Commit for issue at
http://code.google.com/p/android/issues/detail?id=25916&colspec=ID%20Type%20Status%20Owner%20Summary%20Stars&start=100

[Problem]
Dropdown popup of Spinner become wider than device's width if selected
item's content's width is larger than device's screen.

[Cause]
Spinner just display dropdown popup with measured content's width
although measured content's width is wider than device's screen.

[Solution]
If calculated content's width is wider than device's screen, set width
of spinner's dropdown popup to fit on device.

Change-Id: I3276e5ff745c6ba1437c07fc55645d6b53fef89a
Signed-off-by: SeongJae Park <sj38.park@gmail.com>
2012-02-29 10:48:11 +09: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
The Android Automerger
b3453d7db1 merge in ics-mr1-release history after reset to ics-mr1 2012-02-28 15:14:55 -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