8809 Commits

Author SHA1 Message Date
Brad Fitzpatrick
44d2c69ad3 Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
Bug: 3110967
Change-Id: I156070956528c8c7d1eb6db5d2e8bb1fe119178d
2010-10-19 12:19:41 -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
Wu-cheng Li
2fe6fcaff4 Fix some camera orientation javadoc errors.
bug:3105659
Change-Id: I0e54f6dd3aa8aeb2494f2596130a5aeb9e1449ba
2010-10-19 19:14:04 +08:00
Sylvain Fonteneau
dd7341f775 Added missing implementation for NdefRecord.
Implemented constructor using a byte array to parse.
Added missing exception in method declaration, leading to update api/current.xml

Change-Id: I2660484aef1225e90c2f32a572041a2c3aecf288
2010-10-18 19:09:26 -07:00
Dianne Hackborn
3d2818d34f Remove public resource padding.
Change-Id: I8a530a23284a1f2515b1340a1c5e5ed3a0b90780
2010-10-18 18:20:02 -07:00
Brad Fitzpatrick
b4157a432c Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread 2010-10-18 16:46:03 -07:00
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
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
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
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
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
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
Gilles Debunne
3d01cb934b Merge "Removed "Select word" option on password fields." into gingerbread 2010-10-18 10:16:13 -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
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
Nick Kralevich
5e7b7cd65b Merge "range checking for tnf" into gingerbread 2010-10-15 17:06:30 -07:00
Nick Kralevich
6df23609d4 range checking for tnf
Change-Id: Ie94acd598d3b8b349ffa98cef0f64ef8fa9f9612
2010-10-15 16:45:51 -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
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
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
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
Leon Scroggins
36cb18cf06 Merge "Line up textfield with WebTextView more often." into gingerbread 2010-10-15 13:58: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
Scott Main
2c1dab4483 am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
Merge commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c' into gingerbread

* commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c':
  docs: fix typo; surface dev guide link in package description
2010-10-15 12:35:04 -07:00
Leon Scroggins
2a30744cd7 Line up textfield with WebTextView more often.
Bug:3097705

Line up when the selection changes (such as when the
selection is altered by the context menu) or when the
WebTextView scrolls.

Change-Id: Ia491064548131be1ac6f4d701a43cd8419a25367
2010-10-15 14:49:18 -04:00
Nick Pelly
a851d8d0cf Merge "NFC: Move NFC service implementation out of system_server." into gingerbread 2010-10-15 10:55:11 -07:00
Scott Main
36cdecd89d docs: fix typo; surface dev guide link in package description
Change-Id: I2dc09bb6b79cbe3f80819d6193eb0d8a3565310d
2010-10-15 10:19:27 -07:00
Nick Pelly
bc21fdefdf NFC: Move NFC service implementation out of system_server.
NFC service is now an application service in packages/apps/Nfc.

NFC service is registered through ServiceManager.addService(), and the proxy
object NfcAdapter obtains a handle to it through ServiceManager.getService().

**Important** Had to add new symbols AID_NFC / NFC_UID / android.uid.nfc and
modify service_manager.c, Process.java and PackageManagerService.java in order
to force the com.android.nfc process to take a fixed uid, so that it can use
ServiceManager.addService().

Most of the JNI has moved to packages/apps/Nfc/jni. However NdefRecord and
NdefMessage require some in-process native code, so android_com_NdefMessage.cpp
and android_com_NdefRecord.cpp stay in frameworks/base/core/jni. They link to
a very small library libnfc_ndef.so that implements NDEF message parsing. This
has been added to core.mk so all devices (even without NFC hardware) can work
with NDEF data.

Bug: 3041259
Bug: 3097445
Change-Id: If8f00ce8f2053acfc9319ca366d4a9c02bd396e6
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-15 02:12:32 -07:00
Brad Fitzpatrick
e331644cb5 Don't crash on null Vibrator during reboot.
Bug: 3099305
Change-Id: I9af126f7a719f36ae544f517a2fccd0d33339389
2010-10-14 20:53:06 -07:00
Daniel Lehmann
d16f7588a8 Merge "DO NOT MERGE: Private API to pass the selected tab through QuickContacts" into gingerbread 2010-10-14 18:31:16 -07:00
Jaikumar Ganesh
8b525c0760 Merge "Check for state before disconnecting." into gingerbread 2010-10-14 12:36:00 -07:00
Jaikumar Ganesh
5844f1d357 Check for state before disconnecting.
This is a race condition exposed after we turned off some STOPSHIP
logging and some other logging. We drop the ACl connection after 2 secs
of inactivity and hence the device didn't exist -> DBUS crash.

Bug: 3097224
Change-Id: I90adbbee2c5793924037685e484027ed5cd2e0d0
2010-10-14 12:33:16 -07:00
Daniel Lehmann
2f14c62125 DO NOT MERGE: Private API to pass the selected tab through QuickContacts
Bug:3082932

Change-Id: I28dbb21a30fbe22e6e58a8dda534fc9110621c85
2010-10-14 11:26:18 -07:00
Gilles Debunne
53ea7f58c0 Merge "Really leave text selection mode when using the trackball." into gingerbread 2010-10-14 10:58:59 -07:00
Gilles Debunne
d97b7f20b8 Really leave text selection mode when using the trackball.
Bug 3086617

Change-Id: I04c7f5b59d41ed294ac10c20588d2ea476f9d7f6
2010-10-13 19:20:53 -07:00
Kenny Root
bdf8034c65 Merge "OBB: use PBKDF2 for key generation." into gingerbread 2010-10-13 18:29:43 -07:00
Kenny Root
3b1abba6bb OBB: use PBKDF2 for key generation.
Switch to using PBKDF2 for the key generation for OBBs. Any previously
generated OBBs will stop being read correctly. A small pbkdf2gen program
is available to allow generation of appropriate keys with the salts.

Bug: 3059950
Change-Id: If4305c989fd692fd1150eb270dbf751e09c37295
2010-10-13 18:25:33 -07:00
Jaikumar Ganesh
a31cbd61bc Merge "Remove STOPSHIP and reduce log spam." into gingerbread 2010-10-13 16:52:52 -07:00
Vasu Nori
51679ca892 Merge "bug:3069735 in Download UI app, handle deletes correctly" into gingerbread 2010-10-13 16:50:45 -07:00
Jaikumar Ganesh
bdb1d9320b Remove STOPSHIP and reduce log spam.
We still need some logs, as it helped me fix the errant headset bug.

Bug: 3095000
Change-Id: If12601430e6dc30490df1ff86fc3f9d4d455e6d5
2010-10-13 16:48:02 -07:00
Jaikumar Ganesh
c008ca96bb Merge "Work around for errant headsets." into gingerbread 2010-10-13 16:44:17 -07:00