StatusBar: Add support to show data and wifi activities.

-- Show data activity icons.
-- Show wifi activity icons.

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

Change-Id: Iee5038b007e91deeb2d3cb838ce3908818aefc91
Data+MMS changes: Implementation for Legacy Api

- Add overloaded fucntion
  startUsingNetworkFeatureForSubscription
  stopUsingNetworkFeatureForSubscription
  This change is to allow the legacy MMS app
  to work for Data+MMS feature request.
  The purpose of this feature is to enable
  simultaneous PS ATTACH and PDP ACTIVE
- Fix duplicate requests. Add a check to
  prevent duplicate networkRequests being
  send to networkFactories

Conflicts:
services/core/java/com/android/server/ConnectivityService.java
Change-Id: I50bd6eea889a105a12d8b8d2beef6646675836fe
IMS MWI Feature - AIDL Changes

Adding new API to update waiting
voice message count, for UI
propagation.

Change-Id: Ib9b2a0ec7215813329f56d970ca3911ebe665846
CRs-Fixed: 628222
CallLog: Support duration type for CDMA call log

Display the type(Active time/Call out time) in call log
of CDMA call.

Change-Id: Icdc459b0e6aff2ae7f9d44395b6886232de16efe
Keyguard: Add config to always enable emergency call button

As the original design, emergency call button will be hidden on slide
lock screen. Add config_showEmergencyButton to control emergency call
button on slide lock screen.

CRs-Fixed: 640998
Change-Id: Ica29e1ec9043272e9d507307fb8744e8eef57b2e
MSIM(Telephony):Add changes to SMS APIs as per new SmsManager design

Change SMS Msim APIs as per new SmsManager design

Change-Id: I14ad7685e23b14203a76dfe3cc5a95a337f7d0e3
SystemUI: Enhancement for 4G icons

Add 4G LTE icons with sim IDs.

Change-Id: I1608b18cf6cc1652138162cc51f9c088841892d2
Ringtone: Add support for selection of phone ringtone for SIM-2.

-Issue: "The process android.process.media has stopped" pop up is
 displayed when ringtone for SIM-2 is selected.
-Rootcause: There is no type and URI defined for SIM-2 ringtone
 in the RingtoneManager. This is leading to SQl exception when
 executing a selection query.
-Fix: Add URIs for the SIM-2 and SIM-3 ringtones. Define
 interfaces to return them to app side based on subscription ID.

CRs-Fixed: 612945
Change-Id: If68c2d008dd86d2b55d3fb7f5667bbadc238d0b3
IMS-VT: Upgrade/Downgrade change

-Add isVideo API to VideoProfile.VideoState

Change-Id: I0b0b5cc9f59102767dc6947528838b38f18ee38e
frameworks/base: add app launch timeline instrumentation

Displayed Activity is often being used to measure application
launch times. However Displayed Activity only accounts for a
subset of the app launch. This additional instrumentation will
allow for more accurate measurements of applications launch
times.

ActivityManager: Update timeline debug statements
Update the timeline debug messages so that
'ActivityManager' is not used as the tag in log
messages as it interferes with some CTS tests.
CRs-fixed: 628703

This commit combines the changes from KK gerrit 668250 & 543988

Change-Id: I0af42520dc30d89a910e60aebdddf0c4fdd32b3e
Bluetooth: Avoid the crash in LEScanClients following BT process restart

Due to sudden crash and restart of BT process, BTLEClient object to call
is not valid and throws the NullPointerException.

Change-Id: Ie3b98149e83afc5b84b042ce61978eb1599dce49
CRs-Fixed: 729372
Enable NSRM (network socket request manager)

NSRM is a feature to synchronize app socket requests
to reduce network signalling and there by save some power.

Change-Id: Ice992713994045d0582f8cfb7b6761e2689f2555
Conflicts:
services/core/java/com/android/server/AlarmManagerService.java
AppOps: Check user permission before audio recording.

Add permission check before audio recording.

Change-Id: I55c8397df3169e031bba951cf180fa8c5f4c4ce0
Conflicts:
media/java/android/media/AudioRecord.java
Remove SystemServer dependency for DpmService

Remove SystemServer dependency for DpmService and
use AlarmManager and PowerManager services.

Change-Id: I346970ff36acbeaa123e9b550a620ff01137bd75
BootAnimation: Play boot/shutdown animation and music

Add support to show customized boot and shut down animation, as
well as music.

Change-Id: I69c87640175a96a18833a763a34afd362bbfb487
Conflicts:
cmds/bootanimation/Android.mk
cmds/bootanimation/BootAnimation.cpp
Revert "Freeing frame map"

This reverts commit 0c1eeb3c8ab53954218d3b8f4be08ff21be3e985.
Change-Id: I535330edb636f9457beed0849147168eaa6ae2ec
Conflicts:
cmds/bootanimation/BootAnimation.cpp
Bootanimation: Fix the low memory device oom when run boot animation

Low memory device is easily to be oom when run boot animation. Here
we do optimize the boot animation GL Texture only one frame needed.
That is free timely and re-init it again. When in boot animation,
the fps=15, so it is ok to do the delete and re-init.

CRs-Fixed: 572325
Change-Id: I1e81c3d0f3600ac895f9bd7bd00a284f3d4b7d4c
Telephony: Add 7bit Ascii support for long messages

Add config item for 7bit Ascii encoding and decoding
support for long messages

Change-Id: I54080a5c63fd2dc470f38edeffbe58729c22adf9
Conflicts:
core/res/res/values/config.xml
Add support for DSDA.

1. Interface changes to inform local call hold and setActiveSubscription
telephony service from telecomm service.
2. Interface in Telecomm manager to query active subscription and switch
to other subscription.
3. Add support in PhoneAccount to maintain LCH & active subscription
information.
4. Interface changes to inform sub switch between inCallUI and Telecomm
service.

Conflicts:
telecomm/java/android/telecom/Call.java
telecomm/java/android/telecom/ParcelableCall.java
telecomm/java/android/telecom/Phone.java
telecomm/java/android/telecom/TelecomManager.java
telecomm/java/com/android/internal/telecom/IConnectionService.aidl
Change-Id: I942122eab45a19ea30abc92c90228d9115c1df78
Conflicts:
telecomm/java/com/android/internal/telecom/ITelecomService.aidl
MSIM(DSDA): Keep the tone ids consistent with Audio module

Keep tone ids of TONE_LOCAL_CW, TONE_SUPERVISORY_CH & TONE_HOLD_RECALL
consistant with audio module to avoid mismatch of tone id values
between telephony & audio.

Change-Id: I9911c0e5c71b16120bf49d172c6fa69581202247
CRs-Fixed: 720550