9333 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Dianne Hackborn
13e46665ff am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UID changed over time." into gingerbread
Merge commit '736f5ec476526f3431d81dec5fb695bdee27e21a' into gingerbread-plus-aosp

* commit '736f5ec476526f3431d81dec5fb695bdee27e21a':
  Work on issue #3101415: Crespo apps seem to have their UID changed over time.
2010-10-15 18:24:49 -07:00
Shimeng (Simon) Wang
d687504e73 am 31e4d66a: Merge "DO NOT MERGE" into gingerbread
Merge commit '31e4d66ada01ea0714304309967a38d07bfce6c6' into gingerbread-plus-aosp

* commit '31e4d66ada01ea0714304309967a38d07bfce6c6':
  DO NOT MERGE
2010-10-15 18:24:06 -07:00
Leon Scroggins
46ca6a2289 am 36cb18cf: Merge "Line up textfield with WebTextView more often." into gingerbread
Merge commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4' into gingerbread-plus-aosp

* commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4':
  Line up textfield with WebTextView more often.
2010-10-15 18:23:58 -07:00
Scott Main
81df9841c6 am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
Merge commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b' into gingerbread-plus-aosp

* commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b':
  docs: fix typo; surface dev guide link in package description
2010-10-15 18:23:34 -07:00
Nick Kralevich
5e7b7cd65b Merge "range checking for tnf" into gingerbread 2010-10-15 17:06:30 -07:00
Jean-Baptiste Queru
36e7790b6b Merge a851d8d0 from gingerbread
Change-Id: Iea0e3fa1662d6326ab337821fe52a65a9dfd989a
2010-10-15 17:02:57 -07:00
Nick Kralevich
6df23609d4 range checking for tnf
Change-Id: Ie94acd598d3b8b349ffa98cef0f64ef8fa9f9612
2010-10-15 16:45:51 -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
Brad Fitzpatrick
33476b2db8 am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into gingerbread
Merge commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6' into gingerbread-plus-aosp

* commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6':
  Don't crash on null Vibrator during reboot.
2010-10-15 08:51:01 -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
c61c98fdba am d16f7588: Merge "DO NOT MERGE: Private API to pass the selected tab through QuickContacts" into gingerbread
Merge commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98' into gingerbread-plus-aosp

* commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98':
  DO NOT MERGE: Private API to pass the selected tab through QuickContacts
2010-10-14 18:34:17 -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
096a1e6c83 am 8b525c07: Merge "Check for state before disconnecting." into gingerbread
Merge commit '8b525c076068eb38106dca05513816c01d8bdddb' into gingerbread-plus-aosp

* commit '8b525c076068eb38106dca05513816c01d8bdddb':
  Check for state before disconnecting.
2010-10-14 13:41: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
Gilles Debunne
4fa7f4f496 am 53ea7f58: Merge "Really leave text selection mode when using the trackball." into gingerbread
Merge commit '53ea7f58c071563b7c5dd0061df39d3b4bf38a63' into gingerbread-plus-aosp

* commit '53ea7f58c071563b7c5dd0061df39d3b4bf38a63':
  Really leave text selection mode when using the trackball.
2010-10-14 12:02:44 -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
Kenny Root
8fda1636e3 am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread
Merge commit 'bdf8034c657147226b2390eef113ff841e0d6065' into gingerbread-plus-aosp

* commit 'bdf8034c657147226b2390eef113ff841e0d6065':
  OBB: use PBKDF2 for key generation.
2010-10-13 22:54:10 -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
a905d95511 am a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbread
Merge commit 'a31cbd61bc53730d756464b0c273475c4f738066' into gingerbread-plus-aosp

* commit 'a31cbd61bc53730d756464b0c273475c4f738066':
  Remove STOPSHIP and reduce log spam.
2010-10-13 16:56:27 -07:00
Vasu Nori
c6bf3eaab4 am 51679ca8: Merge "bug:3069735 in Download UI app, handle deletes correctly" into gingerbread
Merge commit '51679ca89293ef33275b9681018c09be3948bf1c' into gingerbread-plus-aosp

* commit '51679ca89293ef33275b9681018c09be3948bf1c':
  bug:3069735 in Download UI app, handle deletes correctly
2010-10-13 16:52:57 -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
bbb90d134a am c008ca96: Merge "Work around for errant headsets." into gingerbread
Merge commit 'c008ca96bb32289958010dcf8f247c35ab9b1f18' into gingerbread-plus-aosp

* commit 'c008ca96bb32289958010dcf8f247c35ab9b1f18':
  Work around for errant headsets.
2010-10-13 16:48:41 -07:00