When reconnecting disassociate dc and apnContext.

This is done in onActionIntentReconnectAlarm, which is called when
retrying after an error, by setting the ApnContext.DataConnection &
DataConnctionAc to null which intern clears the DataConnection.mApnList.

With the mApnList cleared DataConnection.mRefCount will not be incremented
because the DC will not be found by findReadyDataConnection. Thus fixing
at least one cause of 6529189.

Bug: 6529189
Change-Id: I40ff1966f6fbd2f69e97d77b9db7122e4c5b992f
Preserve retryCount when retrying.

Bug: 6529189
Change-Id: I743aed08aa161d91899aeb2ccacffcd224e48c0a
Lockscreen : Quick / menu unlock

Unlock password/pin lockscreen without pressing enter button

Patchset 2 : Remove unecessary intialization

Change-Id: Iecb5ed52ef28234f6adad813906dc885296a157c

Quick unlock : Fix bug

There is an issue where users whose passwords are greater than 8 chars and
have quick unlock enabled will be unable to unlock their lockscreen.
This is due to the logic evaluating anything beyond 3chars as a password attempt.

This change modifies the quick unlock behavior so that when typing the password,
each character is considered an attempt, however if incorrect, is not reported as a failed attempt.
Only when the user presses enter is it considered an "explicit" attempt and a failed attempt is reported.

Patchset 2 : Rename runnable to better reflect its purpose
Patchset 3 : Switch to new behavior
Patchset 4 : Fix padding

Change-Id: Ida6289c77f6724cb42e8d3b82593f29afe3d6d1b

Menu unlock (frameworks part)

    	The option in Settings/Security/Lockscreen was
    	added before in some CM commit, but not working
    	and was missing a proper frameworks part

Patchet 3: Done like master Danesh M wanted

Change-Id: I589c77cd58d7beb4093e334f074c7f7643d90858

Change-Id: Ida6289c77f6724cb42e8d3b82593f29afe3d6d1b
PowerWidgets : Consume free space when disabled

Eliminate free space when the notification widgets are disabled.

Patchset 2 - Restore import order

Change-Id: Ic844fedd407a8ee363e3de97370d6b264fe045d5
french from ics (meteo, global actions, reboot menu)

Change-Id: I3a3ccf5789c892bbe310dcbe745d83ca4b503f29
Framework: Add missing part of 'Lock before unlock'

Keyguard: Turn lock-before-unlock into a user-configurable setting

Showing the unsecured lock screen (Slider/widget screen) before the
security screen is now a secure Setting (still defaulting to off)

Change-Id: I0a11f82ffe074d289129b2b972ffc0135eea81ed

Other parts were merged already
Kill App on Long-Press Back Key (framework)

Change-Id: Ib78fff9e32d95a0a112ddd9274b79b3a3aa626b9

Conflicts:

	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Long press to kill

Bring changes done in cm7 to ics.
- Vibrate on press
- Show message
- http://review.cyanogenmod.com/#change,5191,patchset=2

Change-Id: Ib1e5eba50cef5d72d81b733f87ac39c09d4212de

Long-press back kill app cleanup

Change-Id: Ida791dca1fbfdc2beccf6ff727b67df56f1956a4

framework: customizable kill app via back key timeout

Allows the time it takes for the back key to kill an app
to be customized via overlay.

Change-Id: Iaa43f81ee448ae7a7663254a830011a0bca5e60f

Conflicts:

	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: Ida791dca1fbfdc2beccf6ff727b67df56f1956a4
Power Widget: Enable LTE switch for Power Widget

Taken from original ICS commit:
  47bab4d2feb4c23315a69acad0de7c33917b4f86

This version will only function for CDMA+LTE devices until
  other GSM+LTE code is ported to jellybean.

Change-Id: I3f7521f5ec4e9f9106c58afd4d5b10c7086b55fd
Merge "Framework: Add missing part of 'Lock before unlock'" into jellybean
Merge "Lockscreen : Quick / menu unlock" into jellybean
Merge "Kill App on Long-Press Back Key (framework)" into jellybean
Framework : Lockscreen - Customizable shortcuts

Allow users to choose lockscreen shortcuts / icons :
	Phone - 1-5 targets
	Tablets - 1-8 targets

CM10 port
---------
Patchset 1-8: Initial port
Patchset 9  : Revert to CM9 drawables
Patchset 10 : Rebase

Change-Id: I9b163efeef8f47b1d21f7f61552ebe424049cfeb
Lockscreen : Background customization (Remaining bits)

Bring over remaining bits of lockscreen background customization

Change background selection for lockscreen to be more
consistant on Tablets (2/2)

Change-Id: Ia1a703ce213fa7698a2fb8e1679eefccd521962b

Change-Id: I970e6737bee037a2ada337dd1c527e339e33a5c2
Framework: Fix battery light not showing

Change-Id: I69c3824cc6ca34a8da049f63e9a28c64eca52f16
Framework: Audio service - add missing pieces from CM9 port

Author: Phil Tunstall
Fix ring/notification volume not restoring correctly on headset (dis)connect

We weren't checking the alias of each stream when restoring, which meant that
for the notification stream volume:
1. The wrong volume level would be stored.
2. The volume level to restore would be retrieved from the wrong place, and then
overwrite the correctly restored ring stream volume.

As well as fixing that I have improved the readability of the code a bit.

 + Change-Id: I95234c2b7ad7dfd4dbd455a56c8a69975c514b50

Author:  Phil Tunstall
Sound preference: Safe volume restore when plugging in a headset (1/2)
When enabled, volumes that were above a threshold (~55%) the previous time
something was connected to the audio jack will be restored to that threshold
rather than their full level.

Affects all sound streams apart from voice call audio.

 + Change-Id: I0007a09ce75b55c95986e38a4cbb24fe4e8200a9

Author: dalingrin
Add separate headset and speaker volumes
This is a simple implementation of keeping separate volume
settings for the wired headset and the speaker without
overhauling the audio system.

This allows a person with sensitive headphones to keep music, ringer
and other stream volumes lower than they would usually keep the
speaker volumes.

 + Change-Id: Ia614c1e3ac548ff4e0104a090cda13b9daef09cb

Author: gsarrica
Allow unlinking of notification sound and ringtone volume.
Thanks to http://forum.aokp.co/ for this.

 + Change-Id: I55db003cc1691fbca5d3e8ea79e088d0622d38ee

Settings side has been merged

Change-Id: I19deecf2346bcf0691dc3a1480791df7b00afb06
GlobalActions: make silent mode the last toggle

if multi user support is enabled, silent mode toggle is above
the user list, but it should be the last.

Change-Id: I7d6146c740827c856e3c8d39d349534dfbfee12d
drawable: fix ugly gradient on dark holo background

Change-Id: Ie426f1460801b8a029def8a1f97f2b911c7bb9cb
Merge commit 'android-4.1.1_r3' into aospmerge
Merge "drawable: fix ugly gradient on dark holo background" into jellybean
Merge "GlobalActions: make silent mode the last toggle" into jellybean