11609 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Eric Laurent
0e7a4d9edc Fix issue 3098880.
Test value returned by getJNIEnv() in android_media_AudioSystem_error_callback()
and exit if NULL.

Change-Id: If30e5a05c585f34c66e6ad8cece3f7b46ef4be8e
2010-10-15 12:33:16 -07:00
Justin Ho
d364366824 Merge "DO NOT MERGE - Updated ADB icon" into gingerbread 2010-10-15 11:53:49 -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
Justin Ho
7e9f686413 DO NOT MERGE - Updated ADB icon
Change-Id: I358ce60203746ccf38d92f71d1c684670737c97b
2010-10-15 11:31:35 -07: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
Justin Ho
b593d97613 Merge "Updated GPS icons and new status bar background" into gingerbread 2010-10-14 18:32:30 -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
Justin Ho
852fcaf183 Updated GPS icons and new status bar background
Change-Id: If901a145b7cdb33b32076dcfb6964be59e3967da
2010-10-14 18:25:50 -07:00
Justin Ho
1fefe88cd0 Another attempt at popup assets (hdpi and mdpi)
Change-Id: Iaa0e9b5f3545400b371c029e4152f52b113ab091
2010-10-14 17:26:54 -07:00
Jesse Wilson
8f666c2db1 Merge "Test that we don't leak sensitive information when logging cookies." into gingerbread 2010-10-14 15:57:59 -07:00
Jesse Wilson
2102bde9d4 Test that we don't leak sensitive information when logging cookies.
Change-Id: I048a785fa7209841ff1bffc365ed5e1bceb53522
http://b/3095990
2010-10-14 15:18:45 -07:00
Kenny Root
229309e582 Merge "Import revised translations" into gingerbread 2010-10-14 14:17:57 -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
Roy West
29f28cdc53 Merge "Change storage names to match 10-13 decision" into gingerbread 2010-10-14 11:15:50 -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
4cc79da76c Import revised translations
Change-Id: I66df6f7374f03bd6596a55026123c6139ab92c83
2010-10-14 09:41:52 -07:00
Roy West
c5c3bae565 Change storage names to match 10-13 decision
Change-Id: I1dc760846e7031a7cd090436da556533961695e1
2010-10-14 05:23:23 -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
Eric Rowe
c9acd79f03 DO NOT MERGE Add additional options and receiver to BT tests
Add address and iterations options to bluetooth pair stress test.  Refactored
BroadcastReceiver into two receivers with one specific to pairing.  The pairing
receiver checks that we are pairing with the correct device, and also will
accept the pairing dialogue/enter a predefined password automatically.

Change-Id: I9c5283f8e9747e8b0129b7400a6b1345e78e46eb
2010-10-13 18:46:07 -07:00
Kenny Root
bdf8034c65 Merge "OBB: use PBKDF2 for key generation." into gingerbread 2010-10-13 18:29:43 -07:00