11542 Commits

Author SHA1 Message Date
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
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
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
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
Justin Ho
c911097095 Merge "Updated media transport controls" into gingerbread 2010-10-13 17:42:03 -07:00
Justin Ho
f0f95e61d4 Updated media transport controls
Change-Id: I928b7fcd0f9bd11d5f642e3c5207b00099fc8b41
2010-10-13 17:39:24 -07:00
Justin Ho
b663412741 Merge "Updating popup center asset (v5)" into gingerbread 2010-10-13 17:15:00 -07:00
Justin Ho
4cc49d3e80 Updating popup center asset (v5)
Change-Id: I0acb31925e011ddbd668894f1291bc1ee94e5c97
2010-10-13 17:11:26 -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
Jaikumar Ganesh
70a053bf1b Work around for errant headsets.
1. Some headsets send an AVCTP connection before an AVDTP connection
When that AVCTP connection fails, we get stuck in IncomingA2DP state
because we don't handle AVCTP signals for now.
We need to handle the signals and fix it better.

2. Also when ACL gets disconnected, reset state i.e
when the low level connection disconnected reset our state.
This is like a fail safe in case we get stuck.

Bug: 3051490
Change-Id: Ibcf188103999ffb1e08c36c2554504c639fb7f50
2010-10-13 16:38:28 -07:00
Mindy Pereira
998c67774a Merge "Never show overscroll if the page scrolls at all." into gingerbread 2010-10-13 16:31:18 -07:00
Mindy Pereira
868322ced8 Merge "Reduce the time it takes to decay the glow after a pull." into gingerbread 2010-10-13 16:23:15 -07:00
Mindy Pereira
22c5ff2282 Never show overscroll if the page scrolls at all.
Fixes b/3092852  Tune overscroll in web views that can scroll both horizontally and vertically

Change-Id: I92cb6d1fa7d2034837654f2d2ddb7c3c997ce893
2010-10-13 16:21:10 -07:00
Vasu Nori
216fa22791 bug:3069735 in Download UI app, handle deletes correctly
gingerbread.
(for more detailed comments, please see the dependent CL
Change-Id: Ib90eb9e647f543312c865d3bbf9a06fb867a648b )

2 changes in this CL.
1. add 2 new columns to downloads table in downloads.db:
    mediaprovider_uri = downloaded file's content_uri in mediaprovider db
    deleted = flag is set to true if a file is to be deleted
2. download UI app shows only those files whose 'deleted' flag is not set

Change-Id: I47c5f72b0a0b354fac3abe3a97752130b8189794
2010-10-13 16:18:44 -07:00
Mindy Pereira
bcfcd8ecd4 Reduce the time it takes to decay the glow after a pull.
The decay is now in line for the decay for absorb glows.
Fixes b/3094064  Overscroll fade timeout is too long

Change-Id: Ida987c8f6193fcb15f743d72c590a5c1daef056d
2010-10-13 16:02:01 -07:00
Kenny Root
49ec3dff43 Merge "OBB: Change documentation to reflect reality" into gingerbread 2010-10-13 14:49:42 -07:00
Kenny Root
e6ae5c3984 Merge "Add shutdown assurance" into gingerbread 2010-10-13 13:19:25 -07:00