Commit Graph

38903 Commits

Author SHA1 Message Date
Shimeng (Simon) Wang
6b2274a11b Merge "Don't force ended when full screen video is returned manually." into gingerbread 2010-10-18 16:40:25 -07:00
Nick Pelly
c5469bd67a am 774b943f: am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
Merge commit '774b943fc6baa7d3e2880382d4dc7ab085d54b65'

* commit '774b943fc6baa7d3e2880382d4dc7ab085d54b65':
  Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
2010-10-18 16:39:30 -07:00
Sylvain Fonteneau
57b757c4b3 am 73cd4fff: am a926540d: Implement methods introduced in draft #5 NFC API.
Merge commit '73cd4fff52aa8fb8f89aeef28bda8b0368b7fc4b'

* commit '73cd4fff52aa8fb8f89aeef28bda8b0368b7fc4b':
  Implement methods introduced in draft #5 NFC API.
2010-10-18 16:38:50 -07:00
Brad Fitzpatrick
62a1eb58bf StrictMode: fix docs to actually compile and add a utility method.
Yes, this is a last minute public API change, but I'm already getting
a lot of inquiries about how to use StrictMode on a GB device but
targetting Eclair or Froyo.  I'd like a simple answer involving
reflection, but the current API is too painful to use via reflection.

I imagine this will be a common request, and it's much easier for us
to write a little blog post about trying it out if there's an easy way
to use it with reflection.

Change-Id: I1f21aaac7e61e5e90d1e4facc0c787d8daf089b1
2010-10-18 16:36:39 -07:00
Shih-wei Liao
b9a8eb3f12 Remove unneeded inclusion of rs_math.rsh.
Change-Id: I7e9beb88c3b0fb88e30bdbabdde2a2529825dbef
2010-10-18 16:31:50 -07:00
Shimeng (Simon) Wang
43aaa2dd3f Don't force ended when full screen video is returned manually.
issue: 3102273
Change-Id: Id9983a229e103dd255b280638979712873117d10
2010-10-18 16:25:59 -07:00
Jaikumar Ganesh
96eeb7e1ad Merge "Fix race condition between starting of service and getting the Profile Proxy." 2010-10-18 15:59:55 -07:00
Jaikumar Ganesh
7d0548d094 Fix race condition between starting of service and getting the Profile Proxy.
Incoming A2DP connections were not working.

Change-Id: I5a3322ddb39b2512495b4cd2e35593da0f605087
2010-10-18 15:32:11 -07:00
Gilles Debunne
d040f95190 Temporarily removed call to drawCircle in BulletSpan.
Replaced by a drawPath. drawCircle is not supported by openGL for now.

Bug: 3101235

Change-Id: I0c050097e3cb87f9d4c703062d4250d08247c99e
2010-10-18 15:29:02 -07:00
Nick Pelly
7dced8de38 am 2b51fcb9: Merge "NFC: broadcast intent constants for adapter state change" into gingerbread
Merge commit '2b51fcb9ac80c7c42be8f53763773414ba9ca4fa' into gingerbread-plus-aosp

* commit '2b51fcb9ac80c7c42be8f53763773414ba9ca4fa':
  NFC: broadcast intent constants for adapter state change
2010-10-18 15:23:17 -07:00
Nick Pelly
38476ef2f1 am 8f1e7b62: Merge "Cleanspec to fix incremental build failures of the form:" into gingerbread
Merge commit '8f1e7b62d87b6e2f5fbc9609baf1dea7873218ce' into gingerbread-plus-aosp

* commit '8f1e7b62d87b6e2f5fbc9609baf1dea7873218ce':
  Cleanspec to fix incremental build failures of the form:
2010-10-18 15:20:36 -07:00
Mike Lockwood
8333d59133 am 5d5a9db5: Merge "GPS: Enable some more logging" into gingerbread
Merge commit '5d5a9db514a9cf42fbc189fc3af6da602d89b747' into gingerbread-plus-aosp

* commit '5d5a9db514a9cf42fbc189fc3af6da602d89b747':
  GPS: Enable some more logging
2010-10-18 15:20:31 -07:00
Nick Pelly
2b51fcb9ac Merge "NFC: broadcast intent constants for adapter state change" into gingerbread 2010-10-18 15:18:59 -07:00
Brad Fitzpatrick
afb082dba5 NFC: broadcast intent constants for adapter state change
These are @hide for now.  Sent by Iec9596a and used in Ief09a5a4

Bug: 3097279
Change-Id: Ie5dc05e33a98366fbe1767d19ac0253651abe862
2010-10-18 15:17:48 -07:00
Nick Pelly
8f1e7b62d8 Merge "Cleanspec to fix incremental build failures of the form:" into gingerbread 2010-10-18 15:17:23 -07:00
Jeff Brown
f2c4060308 am 7689dd49: Merge "Fix bug where home presses were not poking user activity." into gingerbread
Merge commit '7689dd4928d1cc4080e43f83a523521b5ecf44e5' into gingerbread-plus-aosp

* commit '7689dd4928d1cc4080e43f83a523521b5ecf44e5':
  Fix bug where home presses were not poking user activity.
2010-10-18 15:17:12 -07:00
Andreas Huber
8b5161c2ae am d68cda47: An attempt to unregister a handler that\'s no longer registered should not cause an assertion.
Merge commit 'd68cda472a3646966a203338ccac04f0783293b7' into gingerbread-plus-aosp

* commit 'd68cda472a3646966a203338ccac04f0783293b7':
  An attempt to unregister a handler that's no longer registered should not cause an assertion.
2010-10-18 15:17:07 -07:00
Mike Lockwood
5d5a9db514 Merge "GPS: Enable some more logging" into gingerbread 2010-10-18 15:14:46 -07:00
Romain Guy
dbde527e9b Merge "Small cleanup." 2010-10-18 15:14:16 -07:00
Jeff Brown
7689dd4928 Merge "Fix bug where home presses were not poking user activity." into gingerbread 2010-10-18 15:13:33 -07:00
Nick Pelly
31bcbdaa6c Cleanspec to fix incremental build failures of the form:
out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/trustdlogic/trustednfc/android/ILlcpConnectionlessSocket.java:74:
cannot find symbol
symbol  : class LlcpPacket
location: package com.trustedlogic.trustednfc.android.com.trustedlogic.trustednfc.android.LlcpPacket _result = this.receiveFrom(_arg0);

Change-Id: I344c3b882265049cbc11dd5433535376eaadd855
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-18 15:13:00 -07:00
Romain Guy
2665b85b2b Small cleanup.
Change-Id: I0e5b9154a2d93af793d62f462d68cb7c6c3f6d75
2010-10-18 15:11:50 -07:00
Andreas Huber
d68cda472a An attempt to unregister a handler that's no longer registered should not cause an assertion.
There are edge cases in which a handler attempts to unregister itself while on another thread a message fails to be delivered to that very handler and causes automatic unregistration. In this case the handler's good cleanup intentions are thwarted by the CHECK.

Change-Id: I4e41b5e7b619159ecce4856c15cccca031a28b5b
related-to-bug: 3101247
QA-impact: no(!!!) risk
2010-10-18 15:06:04 -07:00
Mike Lockwood
b8d9033d99 GPS: Enable some more logging
Change-Id: I7d13c859002fa96fa8c361c0c709931c6b12eb99
Signed-off-by: Mike Lockwood <lockwood@google.com>
2010-10-18 17:59:48 -04:00
Romain Guy
ab1c57593f Merge "Use VBOs to render most geometries." 2010-10-18 14:58:25 -07:00
Jeff Brown
e2fe69edc0 Fix bug where home presses were not poking user activity.
We now poke user activity twice: once upon dequeueing an event
for dispatch and then again just before we dispatch it.  The second
poke is to compensate for the fact that it can take a few seconds to
identify the dispatch target (if the application is responding slowly)
but we want to keep the display from going to sleep for X amount of time
after the app gets a chance to actually receive the event.  This mirrors
pre-Gingerbread behavior.

Removed some unnecessary code that filters user activity pokes when sending
events to KeyGuard.  We don't need this because KeyGuard already tells the
power manager to disable user activity.

Bug: 3101397
Change-Id: I8c3a77601fdef8f584e84cfdd11aa79da0ff51db
2010-10-18 14:50:13 -07:00
Romain Guy
03750a067e Use VBOs to render most geometries.
Change-Id: I4360dc4fe5693ab425450c107282b2c22db4dca7
2010-10-18 14:49:19 -07:00
Adam Powell
6018745fb7 am 9f85ef4a: Merge "DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView" into gingerbread
Merge commit '9f85ef4aebf510546355866b7cc458551ae3aa7f' into gingerbread-plus-aosp

* commit '9f85ef4aebf510546355866b7cc458551ae3aa7f':
  DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView
2010-10-18 14:23:14 -07:00
Adam Powell
9f85ef4aeb Merge "DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView" into gingerbread 2010-10-18 14:19:52 -07:00
Mike Lockwood
11eada780d am ba2ec2b4: Merge "Enable framework GPS and location manager logging" into gingerbread
Merge commit 'ba2ec2b44f33f55ff8507199e4e8b108a4bec7b1' into gingerbread-plus-aosp

* commit 'ba2ec2b44f33f55ff8507199e4e8b108a4bec7b1':
  Enable framework GPS and location manager logging
2010-10-18 14:19:09 -07:00
Mike Lockwood
ba2ec2b44f Merge "Enable framework GPS and location manager logging" into gingerbread 2010-10-18 14:16:15 -07:00
Gilles Debunne
651d813b3b Merge "Fix for text selection at end of line." 2010-10-18 14:10:44 -07:00
Mike Lockwood
2d4d1bf14b Enable framework GPS and location manager logging
Change-Id: Id54fc01e7288e7d90d7b76824b708bcb2ee88333
Signed-off-by: Mike Lockwood <lockwood@google.com>
2010-10-18 17:06:26 -04:00
Adam Powell
48b99ace19 DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView
Change-Id: I7f31270c713cdfa3b49f7e9f8d8457c77067516a
2010-10-18 14:00:02 -07:00
Brian Carlstrom
1b04ed793a Merge "Extended android.os.Debug.dumpNativeHeap to include /proc/self/maps contents" 2010-10-18 13:58:25 -07:00
Eric Rowe
86bf0c7b69 am 72a635a1: Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread
Merge commit '72a635a1e08c1fe316dd91786774677abb11aafa' into gingerbread-plus-aosp

* commit '72a635a1e08c1fe316dd91786774677abb11aafa':
  DO NOT MERGE Add additional options and receiver to BT tests
2010-10-18 13:56:31 -07:00
Eric Rowe
72a635a1e0 Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread 2010-10-18 13:53:48 -07:00
John Huang
085996c411 am 45bd8303: Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread
Merge commit '45bd8303fe20f20843f5a76ddf42a5ace54add58' into gingerbread-plus-aosp

* commit '45bd8303fe20f20843f5a76ddf42a5ace54add58':
  Uncomment SIP/VOIP feature check in SipManager.
2010-10-18 13:44:57 -07:00
John Huang
3e9bcb98c4 am 382717f3: Merge "Set the thread pool size of NIST sip stack to one." into gingerbread
Merge commit '382717f3eeca1a21e9756c7de42b4d31747d1675' into gingerbread-plus-aosp

* commit '382717f3eeca1a21e9756c7de42b4d31747d1675':
  Set the thread pool size of NIST sip stack to one.
2010-10-18 13:42:31 -07:00
John Huang
45bd8303fe Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread 2010-10-18 13:41:04 -07:00
John Huang
382717f3ee Merge "Set the thread pool size of NIST sip stack to one." into gingerbread 2010-10-18 13:39:33 -07:00
Gilles Debunne
d7d3ad477c Fix for text selection at end of line.
Bug 3106935

Change-Id: Ieee7f50385baae359db45472ffc800a01956cb40
2010-10-18 13:20:53 -07:00
Joe Onorato
5747eebf6e am a8d477f0: Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread
Merge commit 'a8d477f0d7fd0cf01c47e37c59f26c5fa4d1cf42' into gingerbread-plus-aosp

* commit 'a8d477f0d7fd0cf01c47e37c59f26c5fa4d1cf42':
  Pressing the power button quickly needs to turn the screen on and off correctly.
2010-10-18 13:16:42 -07:00
Joe Onorato
a8d477f0d7 Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread 2010-10-18 13:14:16 -07:00
Joe Onorato
3d3db601cd Pressing the power button quickly needs to turn the screen on and off correctly.
This does the animation with the power manager lock held, which isn't great, but is safe.

Bug: 3102208
Change-Id: Ib0af3fab1cf6ba47053c10ae8b701376d63802ff
2010-10-18 16:08:16 -04:00
Dirk Dougherty
75ceb8d9db Doc change: escape angle brackets in javadoc comment.
Change-Id: Iad525e3575bc8e8cd65c7127b45a56a6fb56245d
2010-10-18 13:07:55 -07:00
Kenny Root
027610a76e resolved conflicts for merge of 964eb438 to master
Change-Id: I0c54d6b88356d8734d7f51234b0114434414502e
2010-10-18 13:03:35 -07:00
Stephen Hines
afb05db237 Merge "Adding new unit test for rsDebug()." 2010-10-18 12:27:54 -07:00
Steve Block
16b8bf0793 Merge changes I4a85ff69,Idba4acc2
* changes:
  Fix DumpRenderTree2 script to allow only one path to be specified
  Improve error handling in DumpRenderTree2 scripts
2010-10-18 12:23:28 -07:00
Steve Block
24652bc958 Fix DumpRenderTree2 to correctly handle crashed tests
Change-Id: I894987d5b8f24ea31893aefe3cb6450c2736aa90
2010-10-18 20:20:43 +01:00