28665 Commits

Author SHA1 Message Date
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
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
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
Nick Pelly
c2e4daacb4 am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread
Merge commit '1f90908c19ab24791bd54c856b32bb12682496eb' into gingerbread-plus-aosp

* commit '1f90908c19ab24791bd54c856b32bb12682496eb':
  Prevent use of NFC api if device is not featurized for NFC.
2010-10-18 12:04:16 -07:00
Nick Pelly
1f90908c19 Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread 2010-10-18 12:00:48 -07:00
Nick Pelly
fdf9086e24 Prevent use of NFC api if device is not featurized for NFC.
Change-Id: I8724cb947223b7b60814d0be51e1122123ebb98a
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-18 11:52:28 -07:00
Andreas Huber
9b2f18df24 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 'bc96c2848dadaa844f95e89708d9941f73bbf400' into gingerbread-plus-aosp

* commit 'bc96c2848dadaa844f95e89708d9941f73bbf400':
  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-18 11:50:19 -07:00
Ying Wang
ec62719c83 am 004f968d: Merge "Link against the static libcrypto in external/openssl." into gingerbread
Merge commit '004f968d0cf60c08d7b393129ed2d6e4304041e5' into gingerbread-plus-aosp

* commit '004f968d0cf60c08d7b393129ed2d6e4304041e5':
  Link against the static libcrypto in external/openssl.
2010-10-18 11:50:08 -07:00
Andreas Huber
bc96c2848d 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 2010-10-18 11:46:44 -07:00
Ying Wang
004f968d0c Merge "Link against the static libcrypto in external/openssl." into gingerbread 2010-10-18 11:44:28 -07:00
Andreas Huber
8f5214eb6f 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 '02ec432e6eff2ab59165c5b7c9b1a0d6689d0823' into gingerbread-plus-aosp

* commit '02ec432e6eff2ab59165c5b7c9b1a0d6689d0823':
  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-18 11:24:05 -07:00
Andreas Huber
02ec432e6e 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 2010-10-18 11:18:11 -07:00
Andreas Huber
99bc1da79b 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.
Change-Id: I686320d9d4cd826f43c0813c6ba1dc4949d1115f
2010-10-18 10:39:29 -07:00
Gilles Debunne
6775754ae3 am 3d01cb93: Merge "Removed "Select word" option on password fields." into gingerbread
Merge commit '3d01cb934ba2c5161689834d49f520313e554571' into gingerbread-plus-aosp

* commit '3d01cb934ba2c5161689834d49f520313e554571':
  Removed "Select word" option on password fields.
2010-10-18 10:26:50 -07:00
Ben Murdoch
06ff27f0cb am 83366dfb: Merge "Add the HTML5Audio class, to support the audio tag." into gingerbread
Merge commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3' into gingerbread-plus-aosp

* commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3':
  Add the HTML5Audio class, to support the audio tag.
2010-10-18 10:26:43 -07:00
Nick Pelly
6b09a90a81 am e47150e9: Fix up NFC permissions.
Merge commit 'e47150e933e6f610546f57183477f324566e521e' into gingerbread-plus-aosp

* commit 'e47150e933e6f610546f57183477f324566e521e':
  Fix up NFC permissions.
2010-10-18 10:26:12 -07:00
Gilles Debunne
3d01cb934b Merge "Removed "Select word" option on password fields." into gingerbread 2010-10-18 10:16:13 -07:00
Andreas Huber
5a40e394f1 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.
related-to-bug: 3106534
Change-Id: Ie28d72af2f9e93818d1840ac83aa7bc11fa57b3b
2010-10-18 10:16:08 -07:00
Ben Murdoch
83366dfb96 Merge "Add the HTML5Audio class, to support the audio tag." into gingerbread 2010-10-18 10:15:55 -07:00
Nick Pelly
e47150e933 Fix up NFC permissions.
The initial (vendor) implementation had 4 perms, replace with 1.

Requires no permissions:
- Viewing UID, type of discovered tags and cards.
- Viewing the NDEF message contents of NDEF formatted tags and cards.

Requires android.permission.NFC
- Get/Set the local tag "MyTag"
- Creating or using a RawTagConnection (transceive())
- Creating or using a NdefTagConnection (write()/read())

Change-Id: I1b585c7d91738bed6261277061a48cf7c939482a
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-18 10:04:40 -07:00
NoraBora
9b38c6097e Fix FastScroller overlay position bug
after setFastScrollEnabled(false)-->setFastScrollEnabled(true)
the overlay shows up at the top-left instead of center

Change-Id: Idd5d4640398def8391f99962bd1838a3bde98157
2010-10-18 06:35:31 -07:00
Nicolas Roard
3d09e139b3 Add the HTML5Audio class, to support the audio tag.
DO NOT MERGE. Cherry pick to GingerBread.

Bug: 3101402
Change-Id: Id7c9418c102d871933c7534fbde18a4bde5f353b
2010-10-18 12:56:02 +01:00
Hung-ying Tyan
a0cdfbf5b7 Uncomment SIP/VOIP feature check in SipManager.
http://b/issue?id=2971947

Change-Id: I3afa8eb03c4e347b382213dd388354365f766b2f
2010-10-18 19:48:04 +08:00
Chung-yih Wang
66cc5355a1 Set the thread pool size of NIST sip stack to one.
Set the thread pool size to one to fix the out-of-order packets
seen in sip service when the device is waken up from sleep.

bug:http://b/3099715
Change-Id: Ia169e3fde77488068c369e3345ecf6a6d8ddf792
2010-10-18 16:00:47 +08:00
Nick Pelly
774b943fc6 am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
Merge commit 'd1f7f4a68375f879671d300510f23d3ee78a500e' into gingerbread-plus-aosp

* commit 'd1f7f4a68375f879671d300510f23d3ee78a500e':
  Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
2010-10-17 17:50:20 -07:00
Nick Pelly
d1f7f4a683 Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
Change-Id: I9bb67de2956b1ecb765ca4ac142ed9455060bec4
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-17 16:30:40 -07:00
Sylvain Fonteneau
73cd4fff52 am a926540d: Implement methods introduced in draft #5 NFC API.
Merge commit 'a926540d5455a973dd8ca19c00c108620d9c68c2' into gingerbread-plus-aosp

* commit 'a926540d5455a973dd8ca19c00c108620d9c68c2':
  Implement methods introduced in draft #5 NFC API.
2010-10-17 15:17:38 -07:00
Sylvain Fonteneau
a926540d54 Implement methods introduced in draft #5 NFC API.
The API is implemented but still do not support muli-protocol tags.

Change-Id: I5cea3eec7b5b92e8e1106d4660e2400e4433e943
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-17 15:06:45 -07:00
Jim Huang
1fc4d88090 jni: Remove duplicated jniThrowException()
Change-Id: I73a910e4efbf84393b3ce5d7f6e58e61ca88d484
2010-10-17 21:08:53 +08:00
Dianne Hackborn
964eb4389b am 42499170: Implement issue #3094621 and #3094609 - wipe sd card
Merge commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0' into gingerbread-plus-aosp

* commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0':
  Implement issue #3094621 and #3094609 - wipe sd card
2010-10-16 16:51:13 -07:00
Dianne Hackborn
424991704b Implement issue #3094621 and #3094609 - wipe sd card
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command

Also since we have decided that it is important to consider
the Crespo storage as internal storage, DevicePolicyManager
gets a new API to be able to wipe it.  (No big deal, since
all of the work for this is now done in the implementation
of the new UI.)

Change-Id: I32a77c410f710a87dcdcbf6586c09bd2e48a8807
2010-10-16 16:32:15 -07:00
Romain Guy
157fa0aca5 am 77c011ba: Set default heap size to 5MB.
Merge commit '77c011ba75ee1403c9b7626e4676cd3c8746605b' into gingerbread-plus-aosp

* commit '77c011ba75ee1403c9b7626e4676cd3c8746605b':
  Set default heap size to 5MB.
2010-10-15 19:23:32 -07:00
Romain Guy
77c011ba75 Set default heap size to 5MB.
Change-Id: Iac8ae3cbe6b431767776653c9f430983172cfb6f
2010-10-15 19:15:25 -07:00
Eric Laurent
1a32602212 am 208bb08a: Merge "Fix issue 3098880." into gingerbread
Merge commit '208bb08a8b4896bc51b44aeec41b91d4726007cf' into gingerbread-plus-aosp

* commit '208bb08a8b4896bc51b44aeec41b91d4726007cf':
  Fix issue 3098880.
2010-10-15 18:42:06 -07:00
Nick Kralevich
21059b637c am 5e7b7cd6: Merge "range checking for tnf" into gingerbread
Merge commit '5e7b7cd65bea53357ecad68a31a52883897c824b' into gingerbread-plus-aosp

* commit '5e7b7cd65bea53357ecad68a31a52883897c824b':
  range checking for tnf
2010-10-15 18:41:59 -07:00
Kenny Root
097ea0bb50 am dc83fd5a: Merge "Import revised translations DO NOT MERGE" into gingerbread
Merge commit 'dc83fd5a502b255dd29a4ab351fc902105ca6bb8' into gingerbread-plus-aosp

* commit 'dc83fd5a502b255dd29a4ab351fc902105ca6bb8':
  Import revised translations DO NOT MERGE
2010-10-15 18:41:08 -07:00
Jeff Brown
9e0e054388 am 36e65ffd: Merge "Fix a native crash in input dispatcher when windows are removed." into gingerbread
Merge commit '36e65ffd16f2610dcec702e23d596fe4eb6b6c4a' into gingerbread-plus-aosp

* commit '36e65ffd16f2610dcec702e23d596fe4eb6b6c4a':
  Fix a native crash in input dispatcher when windows are removed.
2010-10-15 18:40:45 -07:00
Jeff Brown
6ba052b484 am c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread
Merge commit 'c1a564b108c511c0bdd699567c245b031930e718' into gingerbread-plus-aosp

* commit 'c1a564b108c511c0bdd699567c245b031930e718':
  Add support for secure system overlays.  (DO NOT MERGE)
2010-10-15 18:40:39 -07:00
Justin Ho
bce520e646 am b3c2d480: Merge "DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)" into gingerbread
Merge commit 'b3c2d4807f6bc631e2d1091ca4ebb8df39195bca' into gingerbread-plus-aosp

* commit 'b3c2d4807f6bc631e2d1091ca4ebb8df39195bca':
  DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)
2010-10-15 18:39:33 -07:00
Scott Main
20856f71d9 am c9f7890a: Revise some javadocs for NFC; add package description
Merge commit 'c9f7890a203a013646650a695157277df81b6a17' into gingerbread-plus-aosp

* commit 'c9f7890a203a013646650a695157277df81b6a17':
  Revise some javadocs for NFC; add package description
2010-10-15 18:25:34 -07:00
Shimeng (Simon) Wang
53820a9694 am 7ef6834e: Merge "DO NOT MERGE" into gingerbread
Merge commit '7ef6834eea24e56d6eba3aac7069e9e0981451d7' into gingerbread-plus-aosp

* commit '7ef6834eea24e56d6eba3aac7069e9e0981451d7':
  DO NOT MERGE
2010-10-15 18:25:25 -07:00
Andreas Huber
fb47487259 am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread
Merge commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678' into gingerbread-plus-aosp

* commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678':
  Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
2010-10-15 18:25:14 -07:00