52605 Commits

Author SHA1 Message Date
Jamie Gennis
4532c5e49c Merge "Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Binder." 2011-06-10 10:05:04 -07:00
James Dong
be674b1864 Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_IndexParamPortDefinition" 2011-06-10 09:57:01 -07:00
James Dong
d24f94989f Merge "Correctly handle crop rect event in SoftAVC.cpp" 2011-06-10 09:56:44 -07:00
Ben Komalo
2447edd85b New device policy to disable camera.
This introduces a new policy that a DeviceAdmin can use to disable _all_
cameras on the device. A separate CL will be made on the media side to
watch this policy bit and act accordingly.

Bug: 4185303
Change-Id: I700cfc4a8317bb74087ccae39346d74467fc58b2
2011-06-10 09:37:17 -07:00
Narayan Kamath
d3ee2fa184 Refactor some of TextToSpeech
required to let the Settings code to the same logic
and not have to roll it's own.

Change-Id: I2766b8562c940182a2954555fb1854889c3ac91a
2011-06-10 16:33:28 +01:00
Debashish Chatterjee
d868be588b Made VoicemailContract classes non-instantiable.
Change-Id: I35539e5b293412f4f11b0bc062d754f813d4168e
2011-06-10 16:20:31 +01:00
Andreas Huber
c8841e2ef4 Merge "Make dumpsys(media.player) more useful by having AwesomePlayer populate it." 2011-06-10 08:02:18 -07:00
Narayan Kamath
a5084e6389 Merge "Don't hardcode the default engine." 2011-06-10 07:53:56 -07:00
Dianne Hackborn
0a63ccc63b am 5624b793: am 2bb2d48f: Commit final (maybe) MR 2 API.
* commit '5624b793cb791621a586931d9f02eefdf6cfc7c8':
  Commit final (maybe) MR 2 API.
2011-06-10 07:46:51 -07:00
Dianne Hackborn
15e9d474d1 am 88748e6d: am d86302df: Quiet the log.
* commit '88748e6dc0151916f6bd19ffde8ba96fe8fd0a87':
  Quiet the log.
2011-06-10 07:46:27 -07:00
Dianne Hackborn
f14dff1219 am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public styles.
* commit 'c6adfed6dcea8482e482db58bd396ea8de08426a':
  Okay *now* really enforce the limit on non-public styles.
2011-06-10 07:45:38 -07:00
Narayan Kamath
22302fb7ba Don't hardcode the default engine.
One point to note is that no TTS engine will be selected
by default if there are no system TTS engines.

Change-Id: I397061e3cf29b8a1c66e7864262b43621ef5100d
2011-06-10 15:29:06 +01:00
Ben Murdoch
179c87f6e6 Merge WebKit at r84325: Update user agent string.
Change-Id: I927bd1cfadb3cc5b68f93f761d4d82cdc4f54439
2011-06-10 15:07:51 +01:00
Narayan Kamath
f13874ffe6 Merge "Some TTS fixes." 2011-06-10 06:23:17 -07:00
Narayan Kamath
abc63fbdda Some TTS fixes.
(a) Document the undocumented queue mode (mode == 2)
(b) intern strings to fix a bug in removeCallbacksAndMessages
(c) remove an unnecessarly lock object, change the field it
guarded to volatile.

Change-Id: If46bbfe2afb047b3ba5b3cb9a90c292656379ec1
2011-06-10 13:01:46 +01:00
Debashish Chatterjee
64c99171e8 Merge "Voicemail provider contract definition." 2011-06-10 04:42:32 -07:00
Debashish Chatterjee
489d2d546a Merge "Voicemail related fields in calllog provider." 2011-06-10 04:38:07 -07:00
satok
21e2f1b4a0 Merge "API to set additional subtypes" 2011-06-10 00:26:52 -07:00
satok
e7c6998e0a API to set additional subtypes
Bug: 4321667

- Due to the voice team's strong request

Change-Id: Ia8bbc277c0987bde996e6f65541877cec96a3ca1
2011-06-10 15:26:03 +09:00
Adam Powell
f7728ae964 Merge "Action buttons now use themable style." 2011-06-09 22:07:11 -07:00
Adam Powell
81cf3ecade Action buttons now use themable style.
Obey action view layoutparams.

Change-Id: Ia466008465b57659615fbf9d450ce3fdb3c06379
2011-06-09 22:01:16 -07:00
Brian Carlstrom
f6b6736d12 Merge "KeyChain API refinements" 2011-06-09 21:11:50 -07:00
Brian Carlstrom
93201f545b KeyChain API refinements
Change-Id: I177ab4642e6cd1aa13526c14f0a707175fd79655
2011-06-09 21:11:06 -07:00
Adam Powell
fdac5ea971 Merge "Refine the behavior of split action bars." 2011-06-09 21:08:52 -07:00
Adam Powell
1ab418a222 Refine the behavior of split action bars.
Change-Id: I27212c7554025433ee366f0766971f0092b26d67
2011-06-09 21:01:56 -07:00
Dianne Hackborn
5624b793cb am 2bb2d48f: Commit final (maybe) MR 2 API.
* commit '2bb2d48f9ca1726b8de957ec7ea321c767409c12':
  Commit final (maybe) MR 2 API.
2011-06-09 19:26:25 -07:00
Dianne Hackborn
2bb2d48f9c Commit final (maybe) MR 2 API.
Change-Id: I42f72819a29d4ac7902b7be5af0b5d353d790eae
2011-06-09 19:22:05 -07:00
John Wang
c7a58b4de0 Add toString for IccCard Status and App.
Enhance the debug info for GET_SIM_STATUS. Print out the
Card status and App status instead of Object id. It helps
to debug PUK lock and other SIM related issues.

Change-Id: I489f3933529a9719827a8799c41de8e999db6b40
2011-06-09 19:10:12 -07:00
Marco Nelissen
6b6091a140 am 6a91953c: am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds
* commit '6a91953cc9bb8a48d867cc53e3cf5286d9a2f5ac':
  Make sure we don't read from invalid fds
2011-06-09 18:56:02 -07:00
Romain Guy
5caa0ef360 Merge "Don't apply AA to rects with no rotation/perspective." 2011-06-09 18:55:14 -07:00
Romain Guy
181d0a6cce Don't apply AA to rects with no rotation/perspective.
Change-Id: I21138d4d0589cc28f1dcffb8b675cd81a9900e24
2011-06-09 18:52:38 -07:00
Dianne Hackborn
7bbf6f7d11 am 8297f669: am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
* commit '8297f669356ee997c5faa745815e8b9a7009fba7':
  Fix for not reporting correct "sw" in compat mode.
2011-06-09 18:42:55 -07:00
Dianne Hackborn
e6b03d0979 resolved conflicts for merge of 9dfd7d0a to master
Change-Id: I9fbee3209b7fe5c7b5b42b62309eb60dc49bf9e2
2011-06-09 18:39:37 -07:00
Mathias Agopian
a8eedaee41 Merge "improve orientation sensor with gyro data" 2011-06-09 18:22:19 -07:00
John Wang
924b7c7496 am 4d042048: am 08a8f3f9: Merge "Set emergency call text visibility." into honeycomb-LTE
* commit '4d042048243f38d3062ab4719ac26c9154380115':
  Set emergency call text visibility.
2011-06-09 18:16:49 -07:00
Mathias Agopian
4a081955a6 am 60ee24fe: (-s ours) am 17574b9a: (-s ours) am 19974ecc: Fix a leak in RefBase (DO NOT MERGE)
* commit '60ee24fe487e765c1e6d598aff99b9a5355ef50a':
  Fix a leak in RefBase (DO NOT MERGE)
2011-06-09 18:16:37 -07:00
Dianne Hackborn
a47847fc50 Merge "resolved conflicts for merge of e2aa0490 to master" 2011-06-09 18:00:13 -07:00
Romain Guy
8af7f5f8e4 Merge "Add a way to measure potential framerate of the view hierarchy." 2011-06-09 17:50:51 -07:00
Dianne Hackborn
f741e679c4 resolved conflicts for merge of e2aa0490 to master
Change-Id: Id0448a1598fc93aca0652b29253e02586e35a067
2011-06-09 17:50:36 -07:00
Romain Guy
59a12cae20 Add a way to measure potential framerate of the view hierarchy.
Change-Id: Ia19c7ed143d8a823fd678ffab84613ea075d228a
2011-06-09 17:48:21 -07:00
John Reck
4bfd6f0fe5 Expose hook for crash backup
Allows browser to know when to update the crash state in response
 to a textfield's contents changing

Change-Id: Idda7a2931f4c9ae01418b91bbabb1e237f118664
2011-06-09 17:45:28 -07:00
Dianne Hackborn
88748e6dc0 am d86302df: Quiet the log.
* commit 'd86302df0eb5eb013f7521137eabdbfea4a3a867':
  Quiet the log.
2011-06-09 17:40:08 -07:00
Dianne Hackborn
d86302df0e Quiet the log.
Change-Id: Ie814b579997bb555eae014c22da0f41f1a46940f
2011-06-09 17:37:00 -07:00
Dianne Hackborn
c6adfed6dc am f795e9a8: Okay *now* really enforce the limit on non-public styles.
* commit 'f795e9a86d4f62e5314ef95978c3ea17d90975db':
  Okay *now* really enforce the limit on non-public styles.
2011-06-09 17:28:00 -07:00
Gilles Debunne
aab49b40e8 Merge "Text selection on phone" 2011-06-09 16:56:31 -07:00
Irfan Sheriff
680e0a4782 Merge "Remove interface disable in wifistatemachine" 2011-06-09 16:53:27 -07:00
Irfan Sheriff
89f2ea6fc2 Remove interface disable in wifistatemachine
Supplicant now handles interface disable/enable on its own

Change-Id: Ib104989dd49654befff82261cc531b0646c7b15d
2011-06-09 16:42:36 -07:00
Kazuhiro Ondo
3fc9055c7f CDMALTE: Get roaming status based on SID/NID
Change-Id: Iec70f2036c1c698331696ff9869bfb057604c637
2011-06-09 16:42:18 -07:00
Shimeng (Simon) Wang
52a31da29f Merge "Consider default zoom scale for mobile viewport." 2011-06-09 16:41:18 -07:00
Daisuke Miyakawa
92a1af5498 Merge "Add return value spec and fix typo." 2011-06-09 16:34:10 -07:00