Merge commit '72a635a1e08c1fe316dd91786774677abb11aafa' into gingerbread-plus-aosp
* commit '72a635a1e08c1fe316dd91786774677abb11aafa':
DO NOT MERGE Add additional options and receiver to BT tests
Merge commit '1f90908c19ab24791bd54c856b32bb12682496eb' into gingerbread-plus-aosp
* commit '1f90908c19ab24791bd54c856b32bb12682496eb':
Prevent use of NFC api if device is not featurized for NFC.
Merge commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3' into gingerbread-plus-aosp
* commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3':
Add the HTML5Audio class, to support the audio tag.
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>
Merge commit '13e46665ff69c1a37880762d7d611aacdf02dac7'
* commit '13e46665ff69c1a37880762d7d611aacdf02dac7':
Work on issue #3101415: Crespo apps seem to have their UID changed over time.
after setFastScrollEnabled(false)-->setFastScrollEnabled(true)
the overlay shows up at the top-left instead of center
Change-Id: Idd5d4640398def8391f99962bd1838a3bde98157
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: If7f00cd8f2053acfc9319ca366d4a9c02bd396e6
Signed-off-by: Nick Pelly <npelly@google.com>
The API is implemented but still do not support muli-protocol tags.
Change-Id: I5cea3eec7b5b92e8e1106d4660e2400e4433e943
Signed-off-by: Nick Pelly <npelly@google.com>
Fixes Issue 2771
From now on:
disabling a TextView closes the associated on-screen keyboard
selecting a disabled TextView does not open the on-screen keyboard
can't edit contents if the disabled TextView focus is gained by the directional keys
Change-Id: I44e3c0aff2a0ce1e6426818bfe16c1d19c7c18ac
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
Merge commit '9bb8e5cc3e9f8ae2c46967ee1fd422f3bf1e9429'
* commit '9bb8e5cc3e9f8ae2c46967ee1fd422f3bf1e9429':
Test that we don't leak sensitive information when logging cookies.
Merge commit '77c011ba75ee1403c9b7626e4676cd3c8746605b' into gingerbread-plus-aosp
* commit '77c011ba75ee1403c9b7626e4676cd3c8746605b':
Set default heap size to 5MB.
