Commit Graph

31225 Commits

Author SHA1 Message Date
Mike Lockwood
f001d16081 Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread 2011-02-28 13:11:37 -08:00
Mathias Agopian
26f429d60e Merge "surfaceflinger_client: Don't dereference NULL ptrs." 2011-02-28 12:50:25 -08:00
Christopher Tate
b1586e69a1 Merge "Binder linkage no longer depends on JNI objrefs as persistent tokens" 2011-02-28 12:50:09 -08:00
Mathias Agopian
734db07edf Merge "Fix sp<> conversion operator / constructor" 2011-02-28 12:50:04 -08:00
Xavier Ducrohet
c6a02ff532 am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread
* commit 'edbd6139b9d699879db2f14fb03b7b6a38bab9ea':
  Merge 1911a6f7 into gingerbread. do not merge.
2011-02-28 12:29:08 -08:00
Jamie Gennis
9d4d6c101d Add the MIN_UNDEQUEUED_BUFFERS query to ANW.
This change adds a new query to ANativeWindow for getting the minimum
number of buffers that must be left un-dequeued during the steady-state
operation of the ANativeWindow.

Change-Id: Ie8c461fc26b02ecde02ddb4f95bf763662cf1551
Related-Bug: 3356050
2011-02-28 12:24:40 -08:00
Xavier Ducrohet
13fbf42721 Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread 2011-02-28 12:24:01 -08:00
Christopher Tate
71f64dd876 Binder linkage no longer depends on JNI objrefs as persistent tokens
There are two areas that have changed to eliminate the assumption that
local jobject references are both canonical and persistent:

1. JavaBBinderHolder no longer holds onto and reuses it parent object
reference per se.  Since the underlying JavaBBinder object holds a
real global ref, this was redundant anyway.  Now, for purposes of its
transient need to perform JNI operations, it simply uses the current
jobject ref(s) passed during method invocation, and no longer attempts
to hold these refs beyond the scope of a single invocation.

2. Binder obituaries no longer assume that a jobject reference to a
recipient will always compare == as a 32-bit value with any future
reference to the same object.  The implementation now asks Dalvik
whether object references match.

This amended patch fixes the earlier bug around races between
remote binder death cleanup and local explicit unregistration of
VM-side death recipients.

Bug 2090115

Change-Id: I70bd788a80ea953632b1f466f385ab6b78ef2913
2011-02-28 11:37:20 -08:00
Svetoslav Ganov
4476cd0782 Merge "NubmberPicker up/down arrows do not work." 2011-02-28 11:35:05 -08:00
Dianne Hackborn
661a8c37c8 Merge "You can now specify a custom display size as NxM." 2011-02-28 11:28:38 -08:00
James Dong
6f6b5081f9 Merge "The color conversion from YUV420Planar to RGB only requires the image width to be a multiple of 2, not 4." 2011-02-28 11:27:09 -08:00
Daniel Sandler
d85518e2e3 am 5404812d: Merge "When out of range, show device-appropriate no-signal bars." into honeycomb
* commit '5404812dee9dccbbd43df81752f3061742235982':
  When out of range, show device-appropriate no-signal bars.
2011-02-28 11:26:53 -08:00
Daniel Sandler
f0e1607265 Merge "When out of range, show device-appropriate no-signal bars." into honeycomb 2011-02-28 11:17:38 -08:00
Jean-Baptiste Queru
c3d1930f89 am 71431bb5: am 79b66725: am 25be2c72: am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
* commit '71431bb5ca0d8d566d4ebd9d0bc7eb20950290dc':
  Fix of tearDown() in SingleLaunchActivityTestCase.
2011-02-28 11:08:51 -08:00
Santosh Madhava
d235c7d882 Merge "Fix for issue 3466385: Low quality video properties are applied to all" 2011-02-28 11:06:55 -08:00
Jean-Baptiste Queru
eed59e4fb4 am 79b66725: am 25be2c72: am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
* commit '79b66725b7755e403e10a9d073121789f09b1a9e':
  Fix of tearDown() in SingleLaunchActivityTestCase.
2011-02-28 11:05:55 -08:00
Alex Sakhartchouk
73ea08c378 Merge "These moved into developmnet samples" 2011-02-28 10:59:29 -08:00
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