frameworks/base: Fix Null-Pointer exception for local WV content.

-When local WV contents are played ,scheme is null
 and null-pointer exception is seen.

-Fix is to add null check for scheme.

Change-Id: I0e56f9d324498fd28bc02030bcffb8e5d6363a17
-CRs-fixed: 716596
Modify hasIccCard method definition.

Modify hasIccCard() definition to change slotId
type from long to int.

Change-Id: I1c978487d08c5507195d90ed46f813847fe093e2
Use absolute paths for WBC

For both wbc.jar and wbcservice.jar

Change-Id: I2c61a1361847e06e89b900d8a3795ab6aee959ab
Get proper network type when records loaded

Get preferred netwotk type based on phone ID when records loaded.

Change-Id: I3899a4287edbebf7228e8ed53e4b406ad2c9ef93
Add support for showing Pin/Puk Screens in MultiSim

Add MSIM support for PIN/PUK Screens and operator name.
  * Modify KeyguardUpdateMonitor to include SimState and
    plmn information for all subs.
  * Add new utility functions in KeyguardUpdateMonitor to
    get Pin and Puk locked subIds.
  * Modify PIN and PUK layout to include SUB information.
  * Modify PIN/PUK class to handle subInfoChanged callbacks.
  * Add support to display Attempts remaining in PIN/PUK.
  * Modify CarrierText to include multiple Carrier Names.

Change-Id: I53bdd712c8515f1fd72364a3139e76137fe3825a
audio: audio enhancement for playback and capture.

- Add playback and record support for EVRC, QCELP,
  WMA, AMRWBPLUS, WAV, AC3, and EC3.
- Add support for 5.1 channel recording.
- Add constants for call_state and vsid.
- Add definition for FM and proxy audio devices.

Change-Id: Ib6bba322d4c3bd920be4cb2ef52891de8b1ab568
Conflicts:
media/java/android/media/AudioRecord.java
media/java/android/media/AudioSystem.java
media/java/android/media/MediaRecorder.java
Conflicts:
media/java/android/media/AudioSystem.java
Use a content observer for getting the default APN

Instead of executing a query of the database for the
default APN on every network state change, an observer
is used on the database to be notifited when the apn
has changed. This prevents unneccesary queries on the
the database.

CRs-fixed: 662137

Change-Id: I3155bd8b53a1877413ed54a861df1bfb1853b9e4
Conflicts:
services/core/java/com/android/server/location/GpsLocationProvider.java
Add support for BeiDou and Glonass

Add masks for BeiDou amd Glonass
to delete aiding data
CRs-fixed: 582614
Change-Id: I651adcf4f5486c827bea8487e3437f15cd6d8013
Conflicts:
services/core/java/com/android/server/location/GpsLocationProvider.java
AVRCP 1.5 implementation

AVRCP 1.5 Implementation

Conflicts:
	media/java/android/media/AudioManager.java
	media/java/android/media/session/MediaSession.java

Change-Id: I9a21348ec7e0c21735448ea29b781167f01e1580
modify getSubInfoUsingSubId to match arguments

Change-Id: I1395bca68ccfa7437e359e6aecc02465239876fb
Camera: Add support for video rotation

Adding apis to support video rotation.

CRs-Fixed: 672804
Change-Id: Ic67e82058824a6dc7cc803ef0efe61475350bafc
audio: grant focus to qchat application

To achieve QCHAT concurrencies with telephonoy and music player,
QCHAT application should be allowed to run while voice call is
in HOLD/INACTIVE state. Music player should not be granted audio
focus if QCHAT is running.
Add call state, vsid and all_call_states keys so that application
can set/get keyvalues.

Change-Id: Ia8941bf45074dd4edaa9dc236649293496c76e7b
Revert "Route Emergency calls on CS pipe"

This reverts commit 30410e4b9091ffd740e04490707339256eefdd10
and enables emergency calls on IMS.

Change-Id: I615fd4ad93a89bb56744c07486c7416734cca440
Fixes large number of thumbnails leads to low memory

Due to huge number of pictures taken either by camera or
sceenshots, thumbnails of those pictures fills the internal
storage quickly in low internal memory device

Change-Id: If77e24c20feb89cd1755d308d6f3bc0348c528f9
CRs-Fixed: 650808
framework/base: get proper obb mountpoint based on user handle

Due to invalid obb mount point, CTS test case was failing to mount
obb file at /mnt/shell/emulated/0. Added new API to support user
based mount point for obb.

Change-Id: I9f113bd98ab3a4af00dd7f788b2dc3bc45627d6c
CRs-Fixed: 587497
BootReceiver: Skip subdirectories inside tombstones scan

Properly handle (vendor-specific) subdirs under tombstones
directory by skipping over them.

CRs-Fixed: 407529
Change-Id: I0cecd9fa629fad35d62d508ddaf13968c2e46f93
Fix for framework reboot on format of SD card

MountService is not aware of /storage/emulated/legacy path which is
causing the issue on ExternalStorageFormatter service. We are getting
the a list of non-emulated SD cards and format the first one

Conflicts:
	core/java/android/os/storage/StorageManager.java
	core/res/res/values/symbols.xml

Change-Id: Iba1a9f6e40499f7f6fb095a5ee4e711b02bed439
CRs-fixed: 489037
Auto-Share SdCard on PC on insertion if ums was ON when it was removed

This change will share the sdcard to PC on insertion, if the state
of sd card was SHARED when it was physically removed.

Change-Id: Ie118f8539d011f968ec26ebd4dfebd0499af0239
Ensure to add Persistent Apps to LruProcess List on app restart

This change will ensure to add Persistent Apps to mLruProcesses
if not already present while restarting.Previously, on some
occasions, the process was not getting added to the list
resulting in SecurityException as this process was not found
in the mLruProcesses.

Change-Id: I26813a794e01aae316dffd3cf2bb38ab66ac69a9
Duplicate sounds file names are displayed in notification list

There are few duplicate notification sound files present in
/data/sounds/notifications & data/sounds/notifications/ogg.
- arcturus.ogg
- vega.ogg

Maintain sound files only under /data/sounds/notifications/ogg.

Conflicts:
        data/sounds/AllAudio.mk

Change-Id: Ibe347ed03d19a1ce4cb13c1bce1e4bbc26cb61be
CRs-fixed: 630101