Commit Graph

39274 Commits

Author SHA1 Message Date
Andreas Huber
0062eff837 Merge "Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files." 2011-10-06 09:17:14 -07:00
Steve Block
3b00604f35 Merge "Fix SslError.getPrimaryError() to return -1 if the set of errors is empty" 2011-10-06 08:48:52 -07:00
Justin Ho
a7163253f1 Merge "primary progress updated to fix clipping problem" 2011-10-06 07:39:11 -07:00
Justin Ho
554be3acde Merge "scrubber assets updated to larger size" 2011-10-06 07:39:03 -07:00
Jeff Sharkey
fe5a88d9de Merge "Refine random stats generation." 2011-10-05 23:38:44 -07:00
Michael Jurka
dc056cb5d9 Merge "Adding logging to debug widget deletions" 2011-10-05 22:11:19 -07:00
Jeff Brown
0d13e57bcf Merge "Fix build." 2011-10-05 19:11:04 -07:00
Jim Miller
88d0289823 Merge "Fix 5396647: Move lock slider up by 10dip on lock screen." 2011-10-05 19:08:28 -07:00
Roman Nurik
368bd81bb5 Merge "Add ActionBarCompat sample (CL 2 of 2)" 2011-10-05 18:24:42 -07:00
Jeff Brown
1ccc6a8968 Merge "Fix build." 2011-10-05 18:09:41 -07:00
Eric Laurent
475a271e45 Merge "Fix issue 5381089: problem with A2DP music volume" 2011-10-05 18:02:54 -07:00
Jeff Brown
9f5a5e1be1 Merge "Make SENSOR orientation modes trump rotation lock. Bug: 5371750" 2011-10-05 17:24:29 -07:00
Richard Ngo
c81cfa0c59 Merge "updated blue border for stackviews to new holo blue" 2011-10-05 17:23:33 -07:00
Fabrice Di Meglio
a02befe824 Merge "Fixbug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)" 2011-10-05 17:12:17 -07:00
Irfan Sheriff
68d2146f16 Merge "Add a time threshold for re-enabling networks" 2011-10-05 16:34:40 -07:00
The Android Open Source Project
73dcb60832 Reconcile with ics-factoryrom-release
Change-Id: I656e0ea68c6bf350f391a3922884216955997686
2011-10-05 16:16:03 -07:00
George Mount
0b263afd34 Merge "Fix monkey NullPointerException" 2011-10-05 15:33:46 -07:00
Mathias Agopian
2eaf5f53ed Merge "Force a repaint when hwc invalidate hook is called" 2011-10-05 15:09:46 -07:00
Mathias Agopian
e2c2f9213f Force a repaint when hwc invalidate hook is called
without this prepare() would be called but not set() since the
dirty region is empty.

Change-Id: I038acfbdad4c16015357ccde4d1949391d6f989d
2011-10-05 15:00:22 -07:00
Steve Block
a9c3a5f3f2 Merge "Fix SslCertLookupTable to correctly determine whether we have a valid cached decision" 2011-10-05 14:56:21 -07:00
Dirk Dougherty
f960450aeb Merge "Doc change: add diffs for API level 14." 2011-10-05 14:09:49 -07:00
Brian Colonna
9af6198b38 Merge "Added callback for Face Unlock service to poke the wakelock" 2011-10-05 13:58:59 -07:00
Steven Ross
7162b539ff Merge "Killing Facelock when a phonecall comes in" 2011-10-05 12:46:27 -07:00
Scott Main
c836a957bb Merge "docs: add sample spellcheckerservice to resources docs" 2011-10-05 12:26:31 -07:00
Jason Sams
badf8a55e2 Merge "Wrapping new API with #defines to prevent old apps from using them." 2011-10-05 12:01:51 -07:00
Nicolas Roard
d876231e77 Merge "Streamline the layers update codepath. Directly update the layers transform and position. This makes updates faster and less dependent on other webkit work." 2011-10-05 11:35:29 -07:00
Dianne Hackborn
1186816d75 Merge "Always unfreeze display." 2011-10-05 11:25:19 -07:00
Dianne Hackborn
eafaafa724 Merge "Some new ICS target SDK changes." 2011-10-05 11:25:02 -07:00
Dianne Hackborn
2225e995e1 Merge "Fix issue #5348948: Third Party app "Byki Turkish" shows..." 2011-10-05 11:15:13 -07:00
Andreas Huber
ea42e614bf Merge "Set crop params to ANative Window during Initialization." 2011-10-05 10:36:20 -07:00
Irfan Sheriff
19bc6e3877 Merge "Handle unexpected interface up/down events" 2011-10-05 10:03:54 -07:00
Steve Block
8ed8980188 Merge changes I447cd196,I0c6cdae4
* changes:
  SSL-related cleanup in BrowserFrame and SslCertLookupTable
  Clean up SslErrorHandlerImpl
2011-10-05 10:00:59 -07:00
Steve Block
b90050cf56 Merge "Fix BrowserFrame to construct SslError using the full URL, rather than the host" 2011-10-05 09:46:27 -07:00
Joe Fernandez
f37b86d5f9 Merge "docs: Camera class JavaDoc FixIts for ICS" 2011-10-05 09:23:03 -07:00
Narayan Kamath
536ada11d3 Merge "Allow listeners to be set before the service connects." 2011-10-05 06:52:24 -07:00
The Android Automerger
353e9e70fe merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-05 06:39:22 -07:00
Steve Block
451c32a33b Merge "Clean up SslError" 2011-10-05 02:28:15 -07:00
Xavier Ducrohet
370152271a Merge "LayoutLib: fix support for textScaleX." 2011-10-04 19:40:23 -07:00
Romain Guy
8bc8b055a3 Merge "Canvas.getClipBounds() was broken and unreliable with OpenGL ES 2.0" 2011-10-04 19:22:41 -07:00
Xavier Ducrohet
7d78c778be Merge "Layoutlib: Typeface support for loading fonts manually." 2011-10-04 19:10:33 -07:00
Xavier Ducrohet
fa1794c18c Merge "Layoutlib now parses system_fonts.xml instead of its own." 2011-10-04 19:10:13 -07:00
Danielle Millett
e5fb988a96 Merge "Adding a flag for if biometric weak has ever been used" 2011-10-04 18:44:55 -07:00
Dianne Hackborn
03623dafb4 Merge "Fix issue #5388352: font size change back to normal" 2011-10-04 18:35:19 -07:00
Fabrice Di Meglio
bcf0bd1629 Merge "Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"" 2011-10-04 17:24:37 -07:00
Svetoslav Ganov
1f32fb119b Merge "Make prompt for headset while typing a password if accessibilbity is on less verbose." 2011-10-04 17:14:57 -07:00
Scott Main
6742e16ef2 Merge "adding Android Beam sample" 2011-10-04 17:09:38 -07:00
Dave Santoro
8d6e66d910 Merge "Fix permission strings to match ICS-FactoryROM." 2011-10-04 16:19:27 -07:00
Christopher Tate
bb7a593bf7 Merge "Add -nosystem flag to adb backup" 2011-10-04 16:16:11 -07:00
Jason Sams
f2ccbfb4af Merge "Fix crash running old HC apps." 2011-10-04 15:53:37 -07:00
Dave Santoro
d31a2f7c8b am 7d535138: (-s ours) DO NOT MERGE New permissions for social stream.
* commit '7d535138c15b3e9f90432fb942f9027fa334b681':
  DO NOT MERGE New permissions for social stream.
2011-10-04 15:48:22 -07:00