NFC toggle: fix context

Change-Id: Ia87e7c7f01a232559e081dd40ed39fa948a2b111
audioflinger: workaround for samsungs volume bug

play music via headset -> notification comes in -> music volume gets set to 0 ->
notification gets played -> music resumes with wrong (much lower) volume

Change-Id: I3961ed48d0687bacb60ee8d4ddc82575f06c908e
camera: Send proper preview window updates to HAL

During setPreviewWindow call camera_preview_window instance will
be passed to the HAL. camera_preview_window instance will never change when
ANativeWindow is updated. Hence HAL tries to use old preview window
handle not knowing that the preview window is updated. Added the
check in camera interface to reset the preview handle based on
whether ANativeWindow instance is changed or not.

CRs-Fixed: 341892
Change-Id: I6743f24cbd4467025d6fe21098c7ce6813017d5e

Frameworks: Allow CameraService to set window when preview is not running

Change-Id: Iab3f652ed3a7639c660e85c98a837215985a3296

 Camera: Enable metadata callback after snapshot

Change-Id: I734fc596b7549d4dcc00aee466e1c4be02e38c8d
CRs-fixed: 346728
Add RIL class for D2 GSM devices with Samsung video call field.

Add a new RIL class with responseCallList that handles the Samsung video call
field. Fixes stuck on hangup and missed incoming call on d2att.

Change-Id: I3204283876a0d1c8af4c6df1c04d8c34c3a6131f
Add SamsungCDMAQualcommRIL class for CDMA Galaxy S III family based on msm8960.

* Samsung CDMA RIL doesn't send CDMA NV in RIUM infomation format which causes
the CDMA RIL stack to crash and end up not being provisioned.
* Samsung put CDMA NV in GSM format. I forced the RIL stack to process CDMA NV
request as a GSM SIM in CDMA mode.
* Fix hangup bug, force drivercall class not to crash due to a malformed
response from ril. I suspect samsung rom ignores that. --FIXED properly JULY 3RD
* Workaround for signal strength.
* Properly fix drivercall which caused a regression in the previous attempt to
fix driver call because the ril is giving another request for videocall
infomation and causing drivercall to crash.
patchset 3, 4, and 7: Cleanup whitespace
patchset 8: wrapped commit message
Change-Id: I733a635edc645f4e7952083008e7eca12d7af015
SamsumgCDMAQualcommRIL: 'Phantom Ringtone' Fix

Import the fix from SamsungRIL to fix the 'Phantom ringtone' (or 'Ring of Death').
See source for comments about the fix.

Change-Id: I0da6586e6a5b47abc9a7ceba45c4c71a5c9052f6
framework/base: hwui: Clear layer FBO after FBO cache is updated

Due to bug in GLRenderer stale FBO remains and can cause
corruption, clear layer fbo when fbo returned to cache.

CRs-fixed: 340481

(cherry picked from commit b01c082e12c4c4091016af1c95d851f29f5b7514)

Conflicts:

	libs/hwui/LayerRenderer.cpp

Change-Id: I8624879b4adbf9438a8c065b78932d1a4a2a15d4
camera: Add missing QCOM_HARDWARE #ifdefs

http://review.cyanogenmod.com/#/c/18206/2 was
missing a few QCOM_HARDWARE #ifdefs even though its origin
was CAF.  So far, 18206 has only had positive effects on
certain QCOM devices, and is a noop or breaks things on
non-QCOM.

Per discussion with arcee - #ifdef the rest as QCOM

Change-Id: I46684ef5e6c580137104ad81b4faf58858bbfdd3
Merge remote-tracking branch 'upstream/ics' into ics