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

34390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Huang
78c206c750 am 085996c4: am 45bd8303: Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread 
Merge commit '085996c411b4d3878dfd97c59bfc4a17da08959b'

* commit '085996c411b4d3878dfd97c59bfc4a17da08959b':
  Uncomment SIP/VOIP feature check in SipManager.
 2010-10-19 09:54:16 -07:00
John Huang
723e997ef9 am 3e9bcb98: am 382717f3: Merge "Set the thread pool size of NIST sip stack to one." into gingerbread 
Merge commit '3e9bcb98c4190b18d113e79ead071a86cd7ca480'

* commit '3e9bcb98c4190b18d113e79ead071a86cd7ca480':
  Set the thread pool size of NIST sip stack to one.
 2010-10-19 09:54:02 -07:00
Joe Onorato
f186dafdfe am 5747eebf: am a8d477f0: Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread 
Merge commit '5747eebf6eb5ea91480dc576c45c752685383e37'

* commit '5747eebf6eb5ea91480dc576c45c752685383e37':
  Pressing the power button quickly needs to turn the screen on and off correctly.
 2010-10-19 09:53:47 -07:00
Nick Pelly
5bc8c853f5 am c2e4daac: am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread 
Merge commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8'

* commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8':
  Prevent use of NFC api if device is not featurized for NFC.
 2010-10-19 09:53:03 -07:00
Andreas Huber
c46b2a7b59 am 9b2f18df: am bc96c284: Merge "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread 
Merge commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2'

* commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2':
  For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
 2010-10-19 09:52:25 -07:00
Ying Wang
3222df8d83 am ec62719c: am 004f968d: Merge "Link against the static libcrypto in external/openssl." into gingerbread 
Merge commit 'ec62719c8396997b436c44906c2760e3914698b8'

* commit 'ec62719c8396997b436c44906c2760e3914698b8':
  Link against the static libcrypto in external/openssl.
 2010-10-19 09:52:16 -07:00
Andreas Huber
3027855fb0 am 8f5214eb: am 02ec432e: Merge "If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs." into gingerbread 
Merge commit '8f5214eb6fa6c85c9c6703da15c4a6cf95ac4b17'

* commit '8f5214eb6fa6c85c9c6703da15c4a6cf95ac4b17':
  If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.
 2010-10-19 09:51:56 -07:00
Alex Sakhartchouk
f7c51552f0 Merge "Some cleanup" 2010-10-19 09:24:55 -07:00
Scott Main
e9ac4e256d add api level 9 'since' flag to docs 
Change-Id: Idee873a20ae0f3f0a9705997c8b73ce7f181906f
 2010-10-19 08:23:35 -07:00
Dianne Hackborn
4fa1a221b4 Remove public resource padding. 
Change-Id: Id4f28ecfb7a87267c256571ed5f98652730b44fc
 2010-10-19 08:16:49 -07:00
Steve Block
32a95514ae Merge "Add fast/js/regexp-overflow.html to DumpRenderTree skip list" 2010-10-19 05:27:12 -07:00
Steve Block
8d1c8048b0 Add fast/js/regexp-overflow.html to DumpRenderTree skip list 
This fails beacsue the result of the test is so large that DRT suffers
OOM when reading the result. This will be fixed when we switch to
DRT2. Skipping for now to keep the crashes at zero.

Also fixes bug numbers for other skipped tests

Bug: 2697589
Change-Id: I897ff1f0a2941d305af5fb1c8de8f6690365fb9e
 2010-10-19 11:10:51 +01:00
Steve Block
02f034220c Merge "Fix DumpRenderTree2 to correctly handle crashed tests" 2010-10-19 02:50:06 -07:00
Adam Powell
8e5992ad66 Merge "New dialog assets. Cancelable AlertDialogs may now be canceled by tapping outside." 2010-10-18 19:01:44 -07:00
Adam Powell
fc94ddef2f New dialog assets. Cancelable AlertDialogs may now be canceled by tapping outside. 
Change-Id: I061f09bd79a5f2b627fb0f01aba36f37449b849d
 2010-10-18 18:57:11 -07:00
Shih-wei Liao
fb0c3aa596 Merge "Remove unneeded inclusion of rs_math.rsh." 2010-10-18 18:12:42 -07:00
Jeff Brown
422266e43d Merge "Add support for calibrating touch position." 2010-10-18 17:42:04 -07:00
Adam Cohen
187f1a951b Merge "Cleaned up the way StackView draws outside of its bounds" 2010-10-18 17:30:46 -07:00
Adam Cohen
d51bbb5b56 Cleaned up the way StackView draws outside of its bounds 
Change-Id: I2a0e8d970434fbaf13b2f82c5d3b3dcbdc2488b5
 2010-10-18 17:24:53 -07:00
Jeff Brown
511ee5f89f Add support for calibrating touch position. 
Useful for tweaking touch screen alignment without having to modify the
kernel device driver x/y axis bounds.

Change-Id: I6ca43d3c138548f9dfb76aa33150a0c853698fb6
 2010-10-18 17:24:49 -07:00
Gilles Debunne
b82213d54b resolved conflicts for merge of 6775754a to master 
Change-Id: Ib03417aa3f13839b7fdf24f7d66b2d449589d41e
 2010-10-18 17:19:57 -07:00
Alex Sakhartchouk
98bfe5d02a Some cleanup 
Change-Id: Ie10746d2f77318d63101d919214e76f778159fa0
 2010-10-18 17:18:50 -07:00
Ben Murdoch
c44651dc1d am 06ff27f0: am 83366dfb: Merge "Add the HTML5Audio class, to support the audio tag." into gingerbread 
Merge commit '06ff27f0cb9eeb53fd35233a30ef5cc5e5586d83'

* commit '06ff27f0cb9eeb53fd35233a30ef5cc5e5586d83':
  Add the HTML5Audio class, to support the audio tag.
 2010-10-18 16:42:34 -07:00
Nick Pelly
54770496d3 am 6b09a90a: am e47150e9: Fix up NFC permissions. 
Merge commit '6b09a90a818137de52a0c7325339849ccf584b9e'

* commit '6b09a90a818137de52a0c7325339849ccf584b9e':
  Fix up NFC permissions.
 2010-10-18 16:42:18 -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
Shih-wei Liao
b9a8eb3f12 Remove unneeded inclusion of rs_math.rsh. 
Change-Id: I7e9beb88c3b0fb88e30bdbabdde2a2529825dbef
 2010-10-18 16:31:50 -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
Romain Guy
dbde527e9b Merge "Small cleanup." 2010-10-18 15:14:16 -07:00
Romain Guy
2665b85b2b Small cleanup. 
Change-Id: I0e5b9154a2d93af793d62f462d68cb7c6c3f6d75
 2010-10-18 15:11:50 -07:00
Romain Guy
ab1c57593f Merge "Use VBOs to render most geometries." 2010-10-18 14:58:25 -07:00
Romain Guy
03750a067e Use VBOs to render most geometries. 
Change-Id: I4360dc4fe5693ab425450c107282b2c22db4dca7
 2010-10-18 14:49:19 -07:00
Gilles Debunne
651d813b3b Merge "Fix for text selection at end of line." 2010-10-18 14:10:44 -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
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
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
Steve Block
fc16915d32 Fix DumpRenderTree2 script to allow only one path to be specified 
Change-Id: I4a85ff69554a9c76af0b2deea747b8414660fee2
 2010-10-18 20:20:42 +01:00
Steve Block
ae47ce0046 Improve error handling in DumpRenderTree2 scripts 
Change-Id: Idba4acc22dd037a001ea5c05cbd6a29292f6de2c
 2010-10-18 20:20:41 +01:00