Snapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01

Change-Id: I3ccb25bf7cde2c22f52260cae0e9957517e6bb5f
Make locale safe paths

generateMultiplePath was using SimpleDateFormat with
the default locale to create paths. In some locales
this resulted in characters that are not safe to use
on all file systems. Explicitly use Locale.US to
be locale safe.

Change-Id: Ic1cc0b83d04a81ab4791b90e34365896c9ca27fc
Snapshot b80adb2c263702442cf2f2d771168400e6ceb9f8

Change-Id: I391d8e1be1a61e68b01f0db371dbb4ed3e5b5933
Snapshot 80117eda51c64366f7a11652956325999b98e433

Change-Id: Ibfbba2f092dd005167d10b07890bf8203602f2cc
Fix NFC JNI local reference and pin table leaks.

Also turn compiler warnings up and fix the easy ones.

Bug: http://code.google.com/p/android/issues/detail?id=20441
Change-Id: I1043300f344b8296cfbb6bfad17388d5c3b314d1
Use LOCAL_REQUIRED_MODULES instead of LOCAL_JNI_SHARED_LIBRARIES

LOCAL_REQUIRED_MODULES creates a dependency of the apk to the jni libs,
while LOCAL_JNI_SHARED_LIBRARIES doesn't. Besides, the latter makes the
jni libs be included in the apk, but the former doesn't.

For a system app link Nfc.apk, there is no reason to use
LOCAL_JNI_SHARED_LIBRARIES. Using LOCAL_REQUIRED_MODULES
deduces the apk size and the device configuration makefile
doesn't need to specify the jni libs in PRODUCT_PACKAGES.

Change-Id: I0d67987424e010157c289a93b1ef075b897ed940
Merge "Fix NFC JNI local reference and pin table leaks."
am f843d899: Merge "Fix NFC JNI local reference and pin table leaks."

* commit 'f843d8995fb94bdb1059061bad650c21ffd3588e':
  Fix NFC JNI local reference and pin table leaks.
Merge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_JNI_SHARED_LIBRARIES"
am be1aec0a: Merge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_JNI_SHARED_LIBRARIES"

# By Chih-Wei Huang
# Via Chih-Wei Huang (1) and Gerrit Code Review (1)
* commit 'be1aec0a4cdd9eca43656b2de289fc711b282caa':
  Use LOCAL_REQUIRED_MODULES instead of LOCAL_JNI_SHARED_LIBRARIES
Merge commit 'android-4.2.2_r1' into jb-mr1

Conflicts:
	Android.mk
	nci/jni/Android.mk
	nci/jni/IntervalTimer.cpp
	nci/jni/NativeLlcpConnectionlessSocket.cpp
	nci/jni/NativeLlcpServiceSocket.cpp
	nci/jni/NativeLlcpSocket.cpp
	nci/jni/NativeNfcManager.cpp
	nci/jni/NativeNfcTag.cpp
	nci/jni/NativeP2pDevice.cpp
	nci/jni/NativeSecureElement.cpp
	nci/jni/NfcJniUtil.cpp
	nci/jni/NfcJniUtil.h
	nci/jni/NfcTag.cpp
	nci/jni/PeerToPeer.cpp
	nci/jni/RouteDataSet.cpp
	nci/jni/SecureElement.cpp
	src/com/android/nfc/NfcApplication.java
	src/com/android/nfc/NfcService.java
	src/com/android/nfc/handover/BluetoothHeadsetHandover.java
	src/com/android/nfc/handover/HandoverManager.java

Change-Id: I676322cfad76e790055380d04c2c65707bbc6b30
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
fix nfc after 4.2.2 merge

Change-Id: I3750693077220e7220f47dc51c7ce70cfc67f912
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1