drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,557 Commits 1 Branch 0 Tags
Commit Graph

53557 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
157c74e7ac Merge "Don't assert on malformed .mp4 content that contains fewer samples than" 2011-06-21 12:13:41 -07:00
James Dong
bbf7c449e1 Merge "Boost software vp8 decoder performance using multi-threaded decoding if possible" 2011-06-21 12:12:06 -07:00
Andreas Huber
3f673f4f05 Merge "Parse the individual segment's duration as a floating point number which is now" 2011-06-21 12:07:47 -07:00
Stephen Hines
79ad3f25bc Support missing RS vector types. 
Change-Id: I87eae3cc79c3963d5a8edf16cc26eee6d93d81d7
 2011-06-21 12:00:55 -07:00
Andreas Huber
467bc25755 Parse the individual segment's duration as a floating point number which is now 
allowed in later HLS specs.

Change-Id: I7c8296acb4e9b0f80022f3057769de0eea9ee0c6
related-to-bug: 4779022
 2011-06-21 11:55:34 -07:00
Daniel Sandler
5a99d56ad1 Merge "Fix statusbar crash when DeskClock alarms go off." 2011-06-21 11:55:13 -07:00
Jaikumar Ganesh
1349030755 Merge "Fix crash during unpair." 2011-06-21 11:44:32 -07:00
Jaikumar Ganesh
f7bc4bd13d Fix crash during unpair. 
Change-Id: I8901abbbb6593b78fb5df93ab5d0085b32b6ba94
 2011-06-21 11:41:00 -07:00
Christopher Tate
88c477ba6c Merge "Pass the data fd number as a command line argument to 'bu'" 2011-06-21 11:40:48 -07:00
Irfan Sheriff
58d1bb497e DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine" 
This reverts commit fe3b33d4ead06c546202753e38188db5e2eaa7fa.

Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64
 2011-06-21 11:38:23 -07:00
Andreas Huber
727863d2de Don't assert on malformed .mp4 content that contains fewer samples than 
described in the time-to-sample box.

Change-Id: Ic6f973212c15012a25f6e849759fd4f14d97e30f
related-to-bug: 4779053
 2011-06-21 11:38:01 -07:00
Jaikumar Ganesh
337b27985a Merge "Fix failure of Opp." 2011-06-21 11:37:47 -07:00
Jaikumar Ganesh
421f010108 Fix failure of Opp. 
Needed due to upgrade of the Bluez stack, we can now
depend on just called createDevice.

Change-Id: I9c547d2ca3ee275365a22447641199eeaf807eac
 2011-06-21 11:36:19 -07:00
Brett Chabot
3523325159 Merge "Include testdata in layoutlib-tests." 2011-06-21 11:27:29 -07:00
Jaikumar Ganesh
b38fa2a0ac Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread 2011-06-21 11:23:51 -07:00
Bruno Oliveira
a62f707da2 am f1c71771: am da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2 
* commit 'f1c71771a2164ed0009ef9b22f9c03bd3b1af3f9':
  Integrating RandomMusicPlayer sample into tree.
 2011-06-21 11:17:12 -07:00
Gilles Debunne
31e92e4f19 Merge "Support for arbitrary ListAdapter in PreferenceActivity." 2011-06-21 11:16:35 -07:00
Bruno Oliveira
f1c71771a2 am da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2 
* commit 'da61eab862dabe00f95c784a01c019e4f7776b23':
  Integrating RandomMusicPlayer sample into tree.
 2011-06-21 11:11:18 -07:00
Gloria Wang
7bafb97d3f Fix a memory leak in the Forward Lock plugin. 
For bug 4770217.

Change-Id: I14f4d4ead524c661e68a20738e7a50e4d8fd92ea
 2011-06-21 11:07:59 -07:00
Bruno Oliveira
da61eab862 Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2 2011-06-21 11:07:47 -07:00
Xavier Ducrohet
fc511683b6 Add missing delegate to the layoutlib. 
Change-Id: I8de5c1093052c40c0cd327a4d02b01651d3b76b5
 2011-06-21 11:03:29 -07:00
Irfan Sheriff
7dd1200589 DO NOT MERGE Revert "Fix lease duration handling" 
This reverts commit 56878760c3f0255dbcc8d78572f784b96ee36cb0.
 2011-06-21 11:01:54 -07:00
Scott Main
69ff6a47c6 am a6632992: am 04295266: add api level 13 flag for docs 
* commit 'a6632992135cf25b273abf7f239d7d378c936007':
  add api level 13 flag for docs
 2011-06-21 10:42:41 -07:00
Scott Main
a663299213 am 04295266: add api level 13 flag for docs 
* commit '04295266b03f3c588b8be6b6be409d59f757b27b':
  add api level 13 flag for docs
 2011-06-21 10:31:09 -07:00
Scott Main
04295266b0 add api level 13 flag for docs 
Change-Id: I03a7739c923b1f38de6b4e77374daed438559548
 2011-06-21 10:17:18 -07:00
Ben Murdoch
c9507ac7e5 Merge changes I465dd712,Ifd607b0c 
* changes:
  Update Android DRT skip list.
  LayoutTests with dumpAsText in the pathname should always dump as text.
 2011-06-21 10:14:16 -07:00
Philip Milne
e9bb84a920 Merge "Accomodate margins in child measurements." 2011-06-21 10:13:15 -07:00
Daniel Sandler
edbdd3a024 Fix statusbar crash when DeskClock alarms go off. 
Bug: 4723790
Change-Id: Ia819b6a35b5b103d28f6db3b25c815f77827f80f
 2011-06-21 12:57:08 -04:00
Ben Murdoch
adafec5e43 Update Android DRT skip list. 
The latest merges have brought in several tests for which we are missing
layout test controller functions. Add them to the skip list until we
address DRT to add the functionality.

Change-Id: I465dd71245f68cc8c67122a52dcbb93a5276c31e
 2011-06-21 17:54:11 +01:00
Jaikumar Ganesh
d762f063be DO NOT MERGE Incoming Bluetooth Connection requests - dialog. 
This sends the intents to the Settings app to show
the dialogs for the incoming connection requests.

Change-Id: Ibe267f7cda28ce2a46c25800df2e8ac685b0b9e6
 2011-06-21 09:27:12 -07:00
Andreas Huber
e2b801e5a4 Merge "Restore legacy soft-aac decoder behaviour. Substitute silence on decode error." 2011-06-21 08:36:51 -07:00
Ben Murdoch
34db30db56 LayoutTests with dumpAsText in the pathname should always dump as text. 
See http://trac.webkit.org/changeset/79403

Change-Id: Ifd607b0c05804dd40a11072cf6862c36aaf448fe
 2011-06-21 13:46:38 +01:00
Mike Lockwood
827de09e89 Merge "MTP: Add support for PTP variant of GetDeviceInfo result." 2011-06-21 05:30:02 -07:00
Mike Lockwood
7d40d42a36 MTP: Add support for PTP variant of GetDeviceInfo result. 
Change-Id: I09f86fda768b7697665e401adb9516588859bf59
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-21 08:27:06 -04:00
Narayan Kamath
4d03462b37 New API for TTS settings. 
Engines must declare a <meta-data> attribute in their
manifest with name "android.speech.tts". This must reference
an XML resource as per
com.android.internal.R.styleable.TextToSpeechEngine.

Change-Id: I56a6b9f1a360174f98c9f39da901ade83d0f38a7
 2011-06-21 10:28:30 +01:00
Svetoslav Ganov
02e2f57dc7 Merge "ListView do not fire accessibility hover events." 2011-06-20 21:52:31 -07:00
Svetoslav Ganov
34e350daf8 ListView do not fire accessibility hover events. 
1. AccessibilityEvent was incorrectly setting the
   connection of an owned AccessibilityRecord after
   the record is initialized since during initialization
   the record may become sealed.

bug:4724101

Change-Id: I39087dc8023c62252f31431ece23de901dc45972
 2011-06-20 21:51:34 -07:00
Wu-cheng Li
fab0f58e9f Merge "Fix camera getMeteringAreas does not return areas correctly." 2011-06-20 21:20:32 -07:00
Wu-cheng Li
d8aab93f96 Fix camera getMeteringAreas does not return areas correctly. 
bug:4494242
Change-Id: Ide5a44fc302ecda22557fc9eba5e7fcd8679712b
 2011-06-21 12:15:50 +08:00
Jim Miller
b2dae831a3 Merge "Handle dropped motion events in MultiWaveView due to high system activity" 2011-06-20 20:58:44 -07:00
Christopher Tate
e26e96bcc1 Pass the data fd number as a command line argument to 'bu' 
This way we don't have to muck with stdin/stdout just to get known
fds for data handling.

Change-Id: If87d19f4867c883a32d4e9afb91b915511b9df19
 2011-06-20 19:26:31 -07:00
David Brown
932368e1ec Merge "Use a static flag to enable/disable CallerInfo "geoDescription" lookup" 2011-06-20 19:20:46 -07:00
Mike Lockwood
10c24ea0a4 Merge "USB: Make MTP/PTP toggle in the USB preferences set the default mode" 2011-06-20 18:56:26 -07:00
Mike Lockwood
422bf6702f USB: Make MTP/PTP toggle in the USB preferences set the default mode 
Change-Id: I438f7f24f06298ad41a99199c26c45bd7884afdd
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-20 21:54:55 -04:00
Philip Milne
b3a8c54389 Accomodate margins in child measurements. 
Also:

. Cater for components that are GONE.
. Include code to draw component bounds and margins when in DEBUG mode.

Change-Id: I688f8b638469eb11987ebb207b7db1dc953e84e7
 2011-06-20 18:47:54 -07:00
Xia Wang
8596457bc3 Fix issues in Opengl Benchmark tests: 
- fix live wallpaper drawing, bind the global vertex program after it
 - scale the icons according to render surface in display icons, also
   add a background for the icon display test case.

Change-Id: I410dfd745a7ebe0ce8a62fc590963bd1f86d1c1a
 2011-06-20 18:39:04 -07:00
Adam Powell
cd8ad7c77f Merge "Don't draw a middle divider on the first visible view." 2011-06-20 18:29:25 -07:00
Adam Powell
bf68f833fe Don't draw a middle divider on the first visible view. 
Change-Id: I44f81e473344c29ac1f1d4ad4c9be86464394b75
 2011-06-20 18:25:05 -07:00
Scott Main
935ccfd9fe Merge "cherrypick from mr2 Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90 docs: fix typos" 2011-06-20 17:59:05 -07:00
Fabrice Di Meglio
8fbe6786a1 Merge "Update BiDiTest app for adding more unit tests" 2011-06-20 17:56:07 -07:00