merge in jb-mr1-release history after reset to jb-mr1-dev
Act on no-prefered-apn-on-connect config option.

bug:7306353
Change-Id: Icf1c21cc8997821a7d50d114c8985728d9bdb02e
Revert "Act on no-prefered-apn-on-connect config option."

breaking jb-mr1-release

This reverts commit 3ff47ff70406e6973226ac966d157a97fa8e9279

Change-Id: I897cc6eecaa0b4a3d248abda0431cd70742ad2df
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
telephony: CdmaServiceStateTracker: Get cdma sub. when ruim ready.

This code made the assumption that cdma subscription isn't needed
when on cdma + lte. QCOM devices need to get both to provision
propertly because some SIM records are missing.

This patch adds a system property ro.cdma.subscribe_on_ruim_ready
to specify that CDMA subscription should be requested using NV
once the SIM records have been read.

Change-Id: I3e989e9f75c08412bb5f19155beea52e7d9f3c43
Set audio mode after accepting the call

Set the audio mode to incall immediately after accepting the call and not wait
till call is reported as ACTIVE by RIL. This is done to speed up time taken for audio
to set up the voice path

(CM change: Remove calls to Rlog, since we haven't imported that yet)

Bug: 7612431
Change-Id: I8008edc64928016ab94aa6d770de248b5d85dc93
Fix ringing audio focus handling.

Test case:
- enable increasing ringtone starting at volume 0
- start any music player
- get an incoming call

Previous behaviour:
When ringtone volume is increased from 0 to 1, music continues playing
even
though ring tone is playing as well.

New behaviour:
When ringtone starts, music is attenuated to make user aware of incoming
call. When ringtone volume is increased to 1, music stops playing.

Change-Id: Ifc32ea162d4527572be0574024116d10ee9bca66
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/frameworks/opt/telephony into aosp
Merge "telephony: CdmaServiceStateTracker: Get cdma sub. when ruim ready." into cm-10.1
Fixed FC on calling unregisterReceiver with non registered receiver arg.

Crash Log: http://pastebin.com/r0qSGvbb

Patchset 1: Fixed a tab.

Patchset 2: Fixed spacing.

Change-Id: Idd3a7d28d62a980e5d8841535b0c9b57ea6e6a01
SamsungCDMAQualcommRIL: add icc handler to run when radio on

Brings bits over from QualcommSharedRIL

This allows d2 with uim to set correct subscription source
instead of being set on NV on first boot.

Change-Id: Ib0a0c7f03bddd7f3eca36b3bad2989d9af6b6dee
d2ril: change readint offset of one

Change-Id: I83ba3096a7d29f87605bebc0f72fe46124c1ca06
Some changes added to compile and run with Java 6 and Java 7.

  - correction of errors with Javac 7:
    - creation of empty classes.

Change-Id: I339ce56273025e389bb0f1cb3cc8450eca62ee11