Commit Graph

31008 Commits

Author SHA1 Message Date
Andreas Huber
2e158a769d Merge "Add the option '-S' to use surface allocated buffers in the stagefright cmdline tool." 2011-02-28 10:40:28 -08:00
Jean-Baptiste Queru
5651616a91 am 25be2c72: am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
* commit '25be2c725eba1c94c7fc700e37b194fdcd83a1fb':
  Fix of tearDown() in SingleLaunchActivityTestCase.
2011-02-28 10:18:30 -08:00
Xavier Ducrohet
47464a81ed am b732b7b5: am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit 'b732b7b5e8192501360edc15fb8c6399d11fb97d':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
2011-02-28 10:15:48 -08:00
Jean-Baptiste Queru
3da332d6fa am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
* commit 'e0537f1859664ba9c9cf87eb9d6dc3c16986dbb8':
  Fix of tearDown() in SingleLaunchActivityTestCase.
2011-02-28 10:15:46 -08:00
Jean-Baptiste Queru
f9d33557e7 Merge "Fix of tearDown() in SingleLaunchActivityTestCase." 2011-02-28 10:12:08 -08:00
Xavier Ducrohet
82eea5be64 am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit 'ce57a7f35344e76689d30f45964d1e37b78280cb':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
2011-02-28 10:10:38 -08:00
Eric Laurent
8b36b84ed6 Merge "Fix issue 3388354." 2011-02-28 09:53:04 -08:00
Xavier Ducrohet
6092202e99 am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit '6504490cde3ec5d48321d539e654d1f2072b33f9':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
2011-02-28 09:51:38 -08:00
Jean-Michel Trivi
c0dbe18620 Merge "Fix bug 3376700 Volume too loud at lowest setting" 2011-02-28 09:33:59 -08:00
Leon Scroggins
9a4452d208 Merge "No radio buttons on <select>" 2011-02-28 09:32:43 -08:00
Rajneesh Chowdury
bba841e76b Merge "Instrumentation code to enable/disable memory leak check using setprop" 2011-02-28 09:26:54 -08:00
Xavier Ducrohet
4256fef269 am dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit 'dff6b8e71dda9f5d841fa26408714aec2aef1505':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
2011-02-28 09:16:38 -08:00
Santosh Madhava
525b30bb35 Merge "Fix for issue 3431967: Memory leak from video editor engine" 2011-02-28 09:12:34 -08:00
Ben Murdoch
5a4084795a Merge "Don't try to output really long URLs HTML5Audio exception handler." 2011-02-28 08:45:10 -08:00
Glenn Kasten
a7fc4a1a1e Merge "Bug 3447027 Limit previews for DRM video" 2011-02-28 08:44:05 -08:00
Vasu Nori
5970dd3684 Merge "fix javadoc on downloadmanager.remove()" 2011-02-28 08:42:24 -08:00
Dirk Dougherty
5bc2a599bf am 1649d91f: am a47ef32e: Merge "Doc change: Add announce for Android at GDC 2011." into honeycomb
* commit '1649d91f781445a78ce09ed5500503fd96eb9113':
  Doc change: Add announce for Android at GDC 2011.
2011-02-27 22:37:44 -08:00
Dirk Dougherty
e43feb9079 am a47ef32e: Merge "Doc change: Add announce for Android at GDC 2011." into honeycomb
* commit 'a47ef32e8bd8eb944e97e12e3b1fac87f87bcd76':
  Doc change: Add announce for Android at GDC 2011.
2011-02-27 22:34:33 -08:00
Dirk Dougherty
82043c0f4e Merge "Doc change: Add announce for Android at GDC 2011." into honeycomb 2011-02-27 22:23:25 -08:00
Jamie Gennis
bd9cbc3b55 surfaceflinger_client: Don't dereference NULL ptrs.
This change adds a null pointer check before dereferencing buffers in
a Surface list of known GraphicBuffer objects.  If not all the buffers
have been dequeued before this list can legitimately contain NULL
entries.

Change-Id: I0e105b53a3f6f9a5404716b7bf150c793ff648a6
2011-02-27 18:43:17 -08:00
Jamie Gennis
e7809762e1 am 0dc5fdb9: am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread
* commit '0dc5fdb9b2fd3b3e2ede5e9607bc21423f357a01':
  Prevent SurfaceFlinger from using layer token 31.
2011-02-27 16:04:42 -08:00
Jamie Gennis
d1ad86f66b am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread
* commit 'e630e5f49ba15005172dceeda7299569b2d2351f':
  Prevent SurfaceFlinger from using layer token 31.
2011-02-27 15:55:21 -08:00
Jamie Gennis
db7b742f65 am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread
* commit '919853ce244f853966817d4adb2f3b7b6e4bbe74':
  Prevent SurfaceFlinger from using layer token 31.
2011-02-27 15:44:36 -08:00
Jamie Gennis
eafc33acff Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread 2011-02-27 15:27:22 -08:00
Vasu Nori
14075ea6af Merge "bug:3474580 fix javadoc" 2011-02-27 15:13:28 -08:00
Jeff Brown
b8f656b325 Merge "Fix a regression matching intents when action doesn't matter." 2011-02-26 16:07:51 -08:00
Jeff Brown
911a0cfb94 Merge "Log errors reading input channel from parcel." 2011-02-26 15:47:14 -08:00
Jeff Brown
b41c8e7387 Merge "Make SHIFT+Backspace be forward delete." 2011-02-26 15:40:51 -08:00
Jeff Brown
66f05878b9 Merge "Add scroll wheel support to TextView." 2011-02-26 14:31:21 -08:00
Mike Lockwood
0a51271c8c am 710c510b: (-s ours) am 8719c406: DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure
* commit '710c510b36a2d260736ca6d036365b18c86b1774':
  DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure
2011-02-26 13:33:19 -08:00
Mike Lockwood
8e0c038217 am fbd67fec: (-s ours) am 0600fff9: DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
* commit 'fbd67fec87e425cfbbd80926cec8cd345d134b4c':
  DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
2011-02-26 13:33:16 -08:00
Mike Lockwood
70e3799cc0 am 1b895639: (-s ours) am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
* commit '1b8956398be6aeacf0383d8e0931771dbd3a6d2b':
  DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
2011-02-26 13:33:12 -08:00
Mike Lockwood
c3ce4d6b44 am bbd460d7: (-s ours) am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
* commit 'bbd460d76dc69eca9a14ab1127b95a55429f460a':
  DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
2011-02-26 13:33:02 -08:00
Mike Lockwood
952c7384bb am 8719c406: DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure
* commit '8719c406c3db17842d9350c1f6611f088d105f38':
  DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure
2011-02-26 13:21:28 -08:00
Mike Lockwood
b97d6bcfb2 am 0600fff9: DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
* commit '0600fff9149df3af01e90d4996b70dbc1ee7c135':
  DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
2011-02-26 13:21:23 -08:00
Mike Lockwood
af21ccaf61 am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
* commit '69e19ae15baa5785667dbf45c7a2d508e429099b':
  DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
2011-02-26 13:21:20 -08:00
Mike Lockwood
673eb806cb am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
* commit '6aea1154bae3a0935fdb9b09b2d91d9548232eb0':
  DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
2011-02-26 13:21:05 -08:00
Jamie Gennis
b2e7977305 Merge "Expand on the SurfaceTexture API docs." 2011-02-25 18:15:22 -08:00
Jesse Wilson
e9abf68913 Merge "Handle rename of LruCache.entryEvicted to entryRemoved" 2011-02-25 17:55:00 -08:00
Jeff Brown
338aa8c9ef Merge "Add support for mouse hover and scroll wheel." 2011-02-25 17:28:50 -08:00
Jesse Wilson
25d8962530 Merge "Callback on any removal, not just evictions." 2011-02-25 17:15:44 -08:00
Glenn Kasten
84851d2b5a Merge "Revert the 11.xml part of bug 3438513" 2011-02-25 17:10:00 -08:00
Mathias Agopian
32bebb0a58 Fix sp<> conversion operator / constructor
some of the conversion operators were not using the proper
pointer type when calling incStrong/decStrong, usually it
has no bad consequences, but for some implementation
of the ref-counted object it could lead to recording the wrong
owner id.

Change-Id: If574b9069b8a4cf6e0911a992c8f095aba799995
2011-02-25 16:20:52 -08:00
Dianne Hackborn
c614e553cc Merge "Implement issue #3426299: Introduce application "stopped" state" 2011-02-25 16:15:27 -08:00
Chet Haase
4de33f6d13 Merge "ViewPropertyAnimator cancels prior animations" 2011-02-25 16:02:34 -08:00
Andreas Huber
2b6fff5ed6 am cd6828e8: (-s ours) am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
* commit 'cd6828e84220c6bdf92bbca12fcd88a8da76387c':
  DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
2011-02-25 15:43:07 -08:00
Andreas Huber
4337714147 am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
* commit '2332cd8c675628f3bdd6e46a8dd6da639bd7f76e':
  DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
2011-02-25 15:38:06 -08:00
Andreas Huber
ebe5114be6 Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb 2011-02-25 15:33:28 -08:00
Adam Cohen
26e9e35d14 Merge "Adding framework support for resizable widgets" 2011-02-25 15:28:29 -08:00
Robert Greenwalt
70817664ab Merge "Fixing the write of BackgroundData setting." 2011-02-25 15:20:30 -08:00