Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,468 Commits 3 Branches 0 Tags
6be063d8a998f1c529f69e4c1649bcdaf514562c
Commit Graph

34468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Fitzpatrick
6be063d8a9 am 5a67749a: am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 
Merge commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1'

* commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1':
  Fix Vibrator permission CTS test broken earlier.
 2010-10-19 13:38:00 -07:00
Chris Tate
fb2378b579 am a30c8835: (-s ours) am 18580319: DO NOT MERGE. Turn down backup logging for release. 
Merge commit 'a30c88359f62391b77874b83825a6e400c5100b3'

* commit 'a30c88359f62391b77874b83825a6e400c5100b3':
  DO NOT MERGE.  Turn down backup logging for release.
 2010-10-19 13:37:13 -07:00
Leon Scroggins
4f4a567217 Tell nativeFindAll whether the new search matches the last one. 
Bug:3108852

Requires a change in external/webkit.

Change-Id: I4333532b4febfa9e832272cf903c3f96ebff0203
 2010-10-19 15:56:56 -04:00
Brad Fitzpatrick
5a67749a35 am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 
Merge commit '987e8d7f9748018d3fee5778645b267a9ee06ff6' into gingerbread-plus-aosp

* commit '987e8d7f9748018d3fee5778645b267a9ee06ff6':
  Fix Vibrator permission CTS test broken earlier.
 2010-10-19 12:25:46 -07:00
Amith Yamasani
5931b1f415 Fix layout issues, add a maxWidth attribute to SearchView. 
Bug: 3067611
Bug: 3067595
 2010-10-19 12:24:27 -07:00
Brad Fitzpatrick
987e8d7f97 Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 2010-10-19 12:12:31 -07:00
Adam Powell
067222d11f Merge "Fix bug 3109812 - NPE in ButtonGroup.dispatchDraw" 2010-10-19 12:04:49 -07:00
Chris Tate
a30c88359f am 18580319: DO NOT MERGE. Turn down backup logging for release. 
Merge commit '1858031946b3627b599475c5894655362e510351' into gingerbread-plus-aosp

* commit '1858031946b3627b599475c5894655362e510351':
  DO NOT MERGE.  Turn down backup logging for release.
 2010-10-19 12:04:44 -07:00
Adam Powell
35f21fe0ff Fix bug 3109812 - NPE in ButtonGroup.dispatchDraw 
Change-Id: Ie8d9b2c0862cc901ed9534e81465fe41ade1f9a0
 2010-10-19 11:54:10 -07:00
Romain Guy
24a7d5d053 Merge "Solve rendering issue with embedded WebViews. Bug #3094017" 2010-10-19 11:46:15 -07:00
Romain Guy
50c0f093d9 Solve rendering issue with embedded WebViews. 
Bug #3094017

The blending mode was not appropriately set after WebView released the
context.

Change-Id: Ib36d48e82c12f6d131dd5a0bcde9106925b8da63
 2010-10-19 11:42:22 -07:00
James Dong
d793f14fc9 Merge "Camera hal change for 0-memcpy in media recording framework" 2010-10-19 11:25:19 -07:00
Chris Tate
1858031946 DO NOT MERGE. Turn down backup logging for release. 
Change-Id: Ib9f4fd15981fcf52b5d5912995c1891836303427
 2010-10-19 11:22:03 -07:00
James Dong
b0a6db20bb Camera hal change for 0-memcpy in media recording framework 
o document the camera hal to clarify the reviewer's questions.

bug - 3042125

Change-Id: I3edf701d084933ee8d1e3b054d222e8c9dfc42a5
 2010-10-19 11:21:03 -07:00
Andreas Huber
e01645137e am 2d00c605: am 52bea277: Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread 
Merge commit '2d00c6050977f3e03665fbfef93f4f6aed041a63'

* commit '2d00c6050977f3e03665fbfef93f4f6aed041a63':
  If we encounter video stream EOS while seeking we may still need to seek audio.
 2010-10-19 11:19:55 -07:00
Kenny Root
1072b7f751 am c0e97872: am 928b0748: Merge "Don\'t symlink native library paths for old apps" into gingerbread 
Merge commit 'c0e9787293b761b04bdb07908751b22458f17bbc'

* commit 'c0e9787293b761b04bdb07908751b22458f17bbc':
  Don't symlink native library paths for old apps
 2010-10-19 11:19:45 -07:00
Wu-cheng Li
4b3370a31c am 9bf511db: am f73d48d7: Merge "Fix some camera orientation javadoc errors." into gingerbread 
Merge commit '9bf511db85db8e8eff8833b3ec2c30cef12f9188'

* commit '9bf511db85db8e8eff8833b3ec2c30cef12f9188':
  Fix some camera orientation javadoc errors.
 2010-10-19 11:19:15 -07:00
Chung-yih Wang
dc58e5211f am cd6fe63f: am b4116c09: Fix the incorrect environment variable name for the thread pool size. 
Merge commit 'cd6fe63fdc2e99da11b19a233afd81e2448d0db2'

* commit 'cd6fe63fdc2e99da11b19a233afd81e2448d0db2':
  Fix the incorrect environment variable name for the thread pool size.
 2010-10-19 11:18:42 -07:00
Sylvain Fonteneau
ca2a75ad56 am 824de4b3: am dd7341f7: Added missing implementation for NdefRecord. 
Merge commit '824de4b3e378a5ef41de1704ee3f50a49d408a66'

* commit '824de4b3e378a5ef41de1704ee3f50a49d408a66':
  Added missing implementation for NdefRecord.
 2010-10-19 11:17:52 -07:00
Brad Fitzpatrick
26e9cf38b2 Fix Vibrator permission CTS test broken earlier. 
Bug: 3106964
Change-Id: I76138780ac64f761fe09ef8ba74382c7ee05d794
 2010-10-19 11:02:20 -07:00
Jean-Baptiste Queru
32343128d9 Skip 494ec19e from gingerbread-plus-aosp (already cherry-picked) 
Change-Id: I319738dccfeb0be82fed2bcc58eb425b222bc0fa
 2010-10-19 10:51:58 -07:00
Jean-Baptiste Queru
ec892d1b04 Skip 69a19fdb from gingerbread-plsu-aosp - already in master 
Change-Id: I9450aeb7526bf551230389aecbda9926e2f5b3f8
 2010-10-19 10:48:26 -07:00
Brad Fitzpatrick
49889d4ffc am c9cff071: am b4157a43: Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread 
Merge commit 'c9cff071af175e559339c54876136612ac5eda3b'

* commit 'c9cff071af175e559339c54876136612ac5eda3b':
  StrictMode: fix docs to actually compile and add a utility method.
 2010-10-19 10:44:52 -07:00
Shimeng (Simon) Wang
b0f67c9d06 am b65058a4: am 6b2274a1: Merge "Don\'t force ended when full screen video is returned manually." into gingerbread 
Merge commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5'

* commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5':
  Don't force ended when full screen video is returned manually.
 2010-10-19 10:44:46 -07:00
Andreas Huber
2d00c60509 am 52bea277: Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread 
Merge commit '52bea277ff92a2a1780e035c82c72082434e7b16' into gingerbread-plus-aosp

* commit '52bea277ff92a2a1780e035c82c72082434e7b16':
  If we encounter video stream EOS while seeking we may still need to seek audio.
 2010-10-19 10:08:32 -07:00
Andreas Huber
52bea277ff Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread 2010-10-19 09:59:01 -07:00
Nick Pelly
29d9849fd7 am 7dced8de: am 2b51fcb9: Merge "NFC: broadcast intent constants for adapter state change" into gingerbread 
Merge commit '7dced8de3813aa42edb59e13e3ea3a2657d06125'

* commit '7dced8de3813aa42edb59e13e3ea3a2657d06125':
  NFC: broadcast intent constants for adapter state change
 2010-10-19 09:56:01 -07:00
Nick Pelly
18286cc601 am 38476ef2: am 8f1e7b62: Merge "Cleanspec to fix incremental build failures of the form:" into gingerbread 
Merge commit '38476ef2f1bc5d8c3540382ea792f709d0b61faf'

* commit '38476ef2f1bc5d8c3540382ea792f709d0b61faf':
  Cleanspec to fix incremental build failures of the form:
 2010-10-19 09:55:52 -07:00
Mike Lockwood
0bc1f39643 am 8333d591: am 5d5a9db5: Merge "GPS: Enable some more logging" into gingerbread 
Merge commit '8333d59133da8e56cfb5465c767e89c61ede28bc'

* commit '8333d59133da8e56cfb5465c767e89c61ede28bc':
  GPS: Enable some more logging
 2010-10-19 09:55:45 -07:00
Jeff Brown
b8b200d108 am f2c40603: am 7689dd49: Merge "Fix bug where home presses were not poking user activity." into gingerbread 
Merge commit 'f2c406030874b355ca9e4e67cc0e3aff6103c23e'

* commit 'f2c406030874b355ca9e4e67cc0e3aff6103c23e':
  Fix bug where home presses were not poking user activity.
 2010-10-19 09:55:39 -07:00
Andreas Huber
9cb1898052 am 8b5161c2: am d68cda47: An attempt to unregister a handler that\'s no longer registered should not cause an assertion. 
Merge commit '8b5161c2aed8637de9bffb1d81298d60ea237caf'

* commit '8b5161c2aed8637de9bffb1d81298d60ea237caf':
  An attempt to unregister a handler that's no longer registered should not cause an assertion.
 2010-10-19 09:55:31 -07:00
Adam Powell
952912fa1d am 6018745f: (-s ours) am 9f85ef4a: Merge "DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView" into gingerbread 
Merge commit '6018745fb7d61f456f3fd96e79d03de28cd40a07'

* commit '6018745fb7d61f456f3fd96e79d03de28cd40a07':
  DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView
 2010-10-19 09:54:53 -07:00
Mike Lockwood
dd074306e1 am 11eada78: am ba2ec2b4: Merge "Enable framework GPS and location manager logging" into gingerbread 
Merge commit '11eada780dc82fcac2a1dad4e2dde1d310b4231c'

* commit '11eada780dc82fcac2a1dad4e2dde1d310b4231c':
  Enable framework GPS and location manager logging
 2010-10-19 09:54:42 -07:00
Eric Rowe
1046553d0a am 86bf0c7b: (-s ours) am 72a635a1: Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread 
Merge commit '86bf0c7b69856124feb41fb1a938dce1f6695949'

* commit '86bf0c7b69856124feb41fb1a938dce1f6695949':
  DO NOT MERGE Add additional options and receiver to BT tests
 2010-10-19 09:54:24 -07:00
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
Andreas Huber
4d450a8657 If we encounter video stream EOS while seeking we may still need to seek audio. 
Change-Id: Ie260942247b6810ca94e86328a3725d75b12181d
related-to-bug: 3108724
 2010-10-19 09:34:44 -07:00
Kenny Root
c0e9787293 am 928b0748: Merge "Don\'t symlink native library paths for old apps" into gingerbread 
Merge commit '928b07480bc5372f2b959bce7b4a3b49651b49b8' into gingerbread-plus-aosp

* commit '928b07480bc5372f2b959bce7b4a3b49651b49b8':
  Don't symlink native library paths for old apps
 2010-10-19 09:33:30 -07:00
Kenny Root
928b07480b Merge "Don't symlink native library paths for old apps" into gingerbread 2010-10-19 09:28:28 -07:00
Alex Sakhartchouk
f7c51552f0 Merge "Some cleanup" 2010-10-19 09:24:55 -07:00
Wu-cheng Li
9bf511db85 am f73d48d7: Merge "Fix some camera orientation javadoc errors." into gingerbread 
Merge commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f' into gingerbread-plus-aosp

* commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f':
  Fix some camera orientation javadoc errors.
 2010-10-19 08:44:13 -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
Wu-cheng Li
f73d48d754 Merge "Fix some camera orientation javadoc errors." into gingerbread 2010-10-19 07:54:17 -07:00
Steve Block
32a95514ae Merge "Add fast/js/regexp-overflow.html to DumpRenderTree skip list" 2010-10-19 05:27:12 -07:00