Revert "Vpn: Setup routes."

This reverts commit cbea2045cbb27d57dc37a3d8d23766a4a89751b5.

Change-Id: I9f2309b2d5a1adb4a359fd9b415398b685a2ec95
Merge remote-tracking branch 'aosp/kitkat-mr2.1-release' into HEAD
Merge "Add config_batterySdCardAccessibility to symbols.xml" into cm-11.0
Bluetooth: pause music player on A2dp service disconnect

When A2dp service disconnects as part of SSR, it marks a2dp state
as unavailable in Audio module but does not pause music player, as
a result when bluedroid stack restarts as part of sub system restart,
media player does not pause and music continues to play on device
speaker.
This change helps to pause the media player, in addition to marking
a2dp as unavailable, so that media player pauses when a2dp service
forcibly disconnects as part of sub system restart with A2dp in
connected state.

CRs-Fixed: 590462
Change-Id: I05ee5bcc808eb438156b64181d54e8ccabe1e186
Bluetooth: Add Total track number.

Add support to add total number of tracks in
Meta-data

Change-Id: I5b1287f791615adcd4f920fe5c7cae0c7c7b04ea
CRs-Fixed: 627869
Fix a NPE when putting a null-Bundle in an Intent

Happens frequently e.g. with GoogleAccountAuthenticator

Change-Id: I284bf153f40ee9cc3e70bce6efcc3b9e6706361b
Media process is crashing with NullPointer exception

Sometime, while creating thumnails list of media files in
compose MMS->attach file,  filepath may be null due to
synchronization issue.
Adding NULL check to avoid NUllPointer exception.

Change-Id: Id6cf5612a959b3ae15b44bc60dbbcbe40c624f09
CRs-Fixed: 636494
WallpaperCropper: Fix crash when set .gif as wallpaper

It returns an equivalent scaled cropBounds as true
crop bounds, then it set the rounded rect by rounding
"out" the true crop rect, this make the rounded crop
rect may out range of the original bitmap, then an error
will happen.

We change to check the rounded crop rect, if it is out
the range of original bitmap, we set the original bitmap
bounds as rounded crop bounds.

CRs-Fixed: 622582

Change-Id: I215ef2a0165adaaadb05c62dee741a8ea6926144
wallpapercropper: OOM issue while opening *.bmp image

This change manages setting of large images as
wallpapers without encountering OOM.

CRs-fixed: 619815
Change-Id: I3a32ec4b42050b146076f0adf6b6e65afd6fae4e
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java
frameworks/base: Fix change propagating issue

destroyLayer() function has been modified in kk. It is not correct
to propagate the UI corruption fix from jb to kk without considering
the new changes made in kk. This change is to make it align with
the new code in kk.

Change-Id: I34d11b230b9390fe8a989ab6f9c7d3a48d586205
Freeing frame map

FileMap memory is never released until application exit

Release it now as the texture is already loaded and the memory
used for the packed resource can be released.

Change-Id: Id08a1e466337b3a0179684eb6a444e18147ee343
Revert "Set some GC parameters only for dalvik"

This reverts commit de4539603e165f8df0d23a21b6a285213d7f712e.

Change-Id: I2fd71b8b8b6e72cdbe929bfc2afe275cb46e6c29
LocationServiceManager: Fix deadlock due to updateMonitoring.

AppOps can be blocked if askOperation is called from main thread.
This causes location service manager to block while updating monitor
information of all location update receivers.

Fix AppOps to report all askOperation calls from main thread.
Also fix location service manager to handle MODE_ASK.

Change-Id: I085f01e992f60456ad24921bf4ce508ece54e8a6
Bluetooth: Adds check to verify Bluetooth adapter state

This checks whether bluetooth is turned ON or not in
BLE stop scan process. BLE scan apis are called from applications
so need to check if BT adapter state is ON to avoid Bluetooth
crash

Change-Id: Ifc472be9b3f8baf978d6cdca2e4743a75b951635
CRs-Fixed: 634617
Bluetooth:Settings:Handled ACTION_STATE_CHANGED intent at boot time

BluetoothAdapter.ACTION_STATE_CHANGED intent is added to foreground
activity to handle BT sync issue with  Power widget at the boot time

Change-Id: Ib26cb4630c711587da789dc920aa66ded97a9a3b
CRs-Fixed: 576879
Send Media button events as foreground Intent

Send foreground intent for Media Button events to Music Player
so that there is no delay in handling these Intents after the
device is rebooted.

Change-Id: I952a8af93586cb96c0a9f6dc910bfb49287f4b9a
CRs-fixed: 611219
Revert "Freeing frame map"

* This is causing a page fault on some devices.

This reverts commit ebbacb00e894ce3737bf0e194d27c557dcebdf9a.

Change-Id: Id3fe36b8d0d025092723287ca4024446e45fc4d4
Fix Javadoc link for getModifierBehavior()

Change-Id: I571db5147a081fcd7190483ba9e7a45b46db224d
Remove duplicate notification...

...Sirrah.ogg is a duplicate of F1_New_MMS.ogg (aka Captain's Log)

Change-Id: I574500e0c4986753fbbb52455dc438874ee7251c
Add android_system_label to symbols.xml

Change-Id: Id5ae4f440becb5039b189ea59a5c459178550e46
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	core/res/res/values/symbols.xml