Merge commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4' into gingerbread-plus-aosp
* commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4':
Line up textfield with WebTextView more often.
Merge commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b' into gingerbread-plus-aosp
* commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b':
docs: fix typo; surface dev guide link in package description
Merge commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c' into gingerbread
* commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c':
docs: fix typo; surface dev guide link in package description
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
Merge commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6' into gingerbread-plus-aosp
* commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6':
Don't crash on null Vibrator during reboot.
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>
Merge commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98' into gingerbread-plus-aosp
* commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98':
DO NOT MERGE: Private API to pass the selected tab through QuickContacts
Merge commit '8b525c076068eb38106dca05513816c01d8bdddb' into gingerbread-plus-aosp
* commit '8b525c076068eb38106dca05513816c01d8bdddb':
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
Merge commit '53ea7f58c071563b7c5dd0061df39d3b4bf38a63' into gingerbread-plus-aosp
* commit '53ea7f58c071563b7c5dd0061df39d3b4bf38a63':
Really leave text selection mode when using the trackball.
Merge commit 'bdf8034c657147226b2390eef113ff841e0d6065' into gingerbread-plus-aosp
* commit 'bdf8034c657147226b2390eef113ff841e0d6065':
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
Merge commit 'c008ca96bb32289958010dcf8f247c35ab9b1f18' into gingerbread-plus-aosp
* commit 'c008ca96bb32289958010dcf8f247c35ab9b1f18':
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
Merge commit '998c67774aa2260ed05a39df45d983feb72e683c' into gingerbread-plus-aosp
* commit '998c67774aa2260ed05a39df45d983feb72e683c':
Never show overscroll if the page scrolls at all.
Merge commit '868322ced806ec58750edd8ce964f4e17507ddad' into gingerbread-plus-aosp
* commit '868322ced806ec58750edd8ce964f4e17507ddad':
Reduce the time it takes to decay the glow after a pull.
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
The decay is now in line for the decay for absorb glows.
Fixes b/3094064 Overscroll fade timeout is too long
Change-Id: Ida987c8f6193fcb15f743d72c590a5c1daef056d
We can't reliably detect when the key for an OBB is incorrect, so just
remove the mention in the documentation. It still returns an error, but
just not the most specific error.
Bug: 3091064
Change-Id: I70e506822f2178a0ac5e4617fe545b23ce0026f4
This change caused Music APP to throw an NPE the fix
is to test that scheme is not null before using it.
Bug: 3092886
Change-Id: Ib29f944cbd9a9ff628462bdd6f4b68a308468536
Merge commit 'dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4' into gingerbread-plus-aosp
* commit 'dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4':
Line up WebTextView text with the page.
- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag,
RawTagConnection, NdefTagConnection.
- Add implementations for all of the new NFC API.
Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6
Signed-off-by: Nick Pelly <npelly@google.com>
