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
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
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
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
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
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
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
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
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
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
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
77c011ba75
Set default heap size to 5MB.
...
Change-Id: Iac8ae3cbe6b431767776653c9f430983172cfb6f
2010-10-15 19:15:25 -07:00
Eric Laurent
208bb08a8b
Merge "Fix issue 3098880." into gingerbread
2010-10-15 17:18:35 -07:00
Nick Kralevich
5e7b7cd65b
Merge "range checking for tnf" into gingerbread
2010-10-15 17:06:30 -07:00
Kenny Root
dc83fd5a50
Merge "Import revised translations DO NOT MERGE" into gingerbread
2010-10-15 16:55:40 -07:00
Jeff Brown
36e65ffd16
Merge "Fix a native crash in input dispatcher when windows are removed." into gingerbread
2010-10-15 16:52:10 -07:00
Jeff Brown
c1a564b108
Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread
2010-10-15 16:52:02 -07:00
Nick Kralevich
6df23609d4
range checking for tnf
...
Change-Id: Ie94acd598d3b8b349ffa98cef0f64ef8fa9f9612
2010-10-15 16:45:51 -07:00
Justin Ho
b3c2d4807f
Merge "DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)" into gingerbread
2010-10-15 16:43:42 -07:00
Gilles Debunne
0dcad2bd01
Removed "Select word" option on password fields.
...
It would return an arbitrary selection around current position.
Rely on select all instead.
Bug: 3100750
Change-Id: I73d995e6481d7c230cc9f334c72fbfb7e9828007
2010-10-15 16:29:25 -07:00
Jeff Brown
af48cae6e5
Fix a native crash in input dispatcher when windows are removed.
...
Bug: 3101826
Change-Id: I040838600a6105c8d9f3235025dc0a7b5b27da2e
2010-10-15 16:20:51 -07:00
Justin Ho
1ef2006409
DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)
...
Change-Id: I5f86585618b008b727de2236b75b357c87840ecf
2010-10-15 16:15:16 -07:00
Jeff Brown
2d3f159aa9
Add support for secure system overlays. (DO NOT MERGE)
...
This change adds a new window type for secure system overlays
created by the system itself from non-secure system overlays that
might be created by applications that have the system alert permission.
Secure views ignore the presence of secure system overlays.
Bug: 3098519
Change-Id: I8f8398f4fdeb0469e5d71124c21bedf121bd8c07
2010-10-15 16:03:35 -07:00
Scott Main
c9f7890a20
Revise some javadocs for NFC; add package description
...
Change-Id: I60223e2ad24af98b3b16a74960365185096ae614
2010-10-15 15:27:16 -07:00
Shimeng (Simon) Wang
7ef6834eea
Merge "DO NOT MERGE" into gingerbread
2010-10-15 15:17:22 -07:00
Kenny Root
88b6faad2c
Import revised translations DO NOT MERGE
...
Change-Id: Ifa466bf152e7331f2ea16e925e714690d9034f3a
2010-10-15 15:11:18 -07:00
Andreas Huber
b04f356d86
Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread
2010-10-15 14:58:54 -07:00
Andreas Huber
ff7a7a455c
Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread
2010-10-15 14:58:05 -07:00
Dianne Hackborn
736f5ec476
Merge "Work on issue #3101415 : Crespo apps seem to have their UID changed over time." into gingerbread
2010-10-15 14:55:06 -07:00
Dianne Hackborn
8bdf5935c0
Work on issue #3101415 : Crespo apps seem to have their UID changed over time.
...
fsync!
Change-Id: Ie6c5397202579935ac69bf61d3e7b3081ecf269c
2010-10-15 14:46:33 -07:00
Irfan Sheriff
4e08a98541
Merge "fix build DO NOT MERGE" into gingerbread
2010-10-15 14:30:36 -07:00
Irfan Sheriff
84510802f1
fix build DO NOT MERGE
...
my local change and gerritt were out of sync
Change-Id: Ie581425f0290bb78b289584067b70507d82d5a57
2010-10-15 14:27:22 -07:00
Justin Ho
73dbdc35d4
Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread
2010-10-15 14:26:08 -07:00
Shimeng (Simon) Wang
bf9cf4d80d
DO NOT MERGE
...
Add wrapper method for native JNI call.
This is to check whether a given mimeType is supported in Android media
framework.
issue: 3101402
Change-Id: Ic8b412c045c36113c830296dacb42ed5f7371c9d
2010-10-15 14:18:01 -07:00
Shimeng (Simon) Wang
31e4d66ada
Merge "DO NOT MERGE" into gingerbread
2010-10-15 14:07:29 -07:00
Justin Ho
ff14aa16ba
DO NOT MERGE - Updated media transport controls (hdpi and mdpi)
...
Change-Id: I9b91c4bc13909017f433724e7c21de0db690eff6
2010-10-15 14:03:57 -07:00
Leon Scroggins
36cb18cf06
Merge "Line up textfield with WebTextView more often." into gingerbread
2010-10-15 13:58:38 -07:00
Irfan Sheriff
f8834f878f
Merge "fetch macaddr right after supplicant connection" into gingerbread
2010-10-15 13:42:38 -07:00
Shimeng (Simon) Wang
9f547a8ca8
DO NOT MERGE
...
Avoid sending false orientation event to webkit.
issue: 3101311
Change-Id: I819f046a119ad108256d6cece3f2e6ec1d643145
2010-10-15 13:34:49 -07:00