telephony: fixup sixbar signal for gsm/lte

and minor cleanup: remove duplicate *_NONE_OR_UNKNOWN

Change-Id: I13f53c9500b44286c1cb93fd27ad1275b1d29484
Wimax: Squashed commit of the following:

Port WimaxHelper and (the toggle) WimaxButton from CM7.

Both WimaxHelper and WimaxButton are updated to support Samsung's
(crespo4g, epicmtd) Wimax4GManager proprietary class, whose API has been
somewhat-significantly changed in ICS.  Support for HTC's (supersonic,
speedy) WimaxController is retained in WimaxHelper, although untested.

Note that WimaxManagerConstants was previously misdocumented, confabulating
the lookup key EXTRA_4G_STATE ("4g_state") with EXTRA_WIMAX_STATUS
("wimax_status"), which no longer exists.  This is also fixed.

SQN: WiMAX: add support for Sequans WiMAX devices

issue: 4G icon does not display when connected to wimax

Change-Id: If199c9251a7abd679b048b5aba3f601b4bf9047e
Framework: Forward port ADB over network (Part 2 of 2)

Includes:
- ADB Over Network, integration of the adb-host mode (already present)
  The feature can be used/tested without the Settings part:

    setprop service.adb.tcp.port 5555

  Note: This ADB setting is not persistent (for security purpose) and
  require init.rc implementation event like this : http://bit.ly/AdbTcpIP

  Author: Tanguy Pruvot
  Id: I5c61a53948349c785356cb5aae165110d75e3074

Change-Id: I101216c5b8ddff5040d9eeaf35afefc5cd98bbf3
Add an option to change the device hostname (1/2).

This adds an option to modify the device hostname used
in ip resolution. This is useful when connecting to the
android device in a dynamic dhcp environment.

Change-Id: I44e4771f4415a32fe66867d4dd90f1ad138341e1

Conflicts:
	core/java/android/provider/Settings.java
Revert "Framework: Forward port ADB over network (Part 2 of 2)"

This reverts commit 6c2ab502ce700deaf82410b7e0bfbd34d595e206.

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: I0bf688074c732b1536e97a30c533835d846a1768
Squashed commit of audio changes from CodeAurora

MediaFile: Add DIVX and MPEG2TS file format

Change-Id: I9f8cfbe8138c6d3d0d824bff2542b91d72a06b82

audio: Define ANC headset and proxy device

Change-Id: I681d73433d874ec66ec0b1f1f39869008d7d7d0d
(cherry picked from commit 1e6c410eadfc510a9f116bb3da142214fe761225)

audio: add support for QCOM WiFi display

- Define QCOM WFD intents
- Register and handle WFD intends in AudioSystem

Change-Id: I1e5a73d4aa5595bed44d24652647c12b7ef4ae1f

audio: add support for QCOM audio formats

- Add support for EVRC, QCELP, and WMA formats

Change-Id: If3676b88fa287b484ef8616c0a6b67177b61a720

PhoneWindowManager: Changes for WFD.

- WFD now sends WIFI_DISPLAY_VIDEO intent to set UI orientation.
- PhoneWindowManager to listen for WFD intents.
- Display on WFD should be same as seen on the HDMI, so set the
  orientation to HDMI orientation

Change-Id: I638adaa906e2151b1c6ae496343714fe828f5dbd

audio: add support for QCOM vocoders

- Add support for EVRC,QCELP and other
  QCOM vocoders

Change-Id: I9b2a18fe7d01a9198eb470e94e7176b7a6da2c7c
base: fix constant conflict

There is a conflict 2 media type which shares the same constants which is a DVIX and JPEG.
which causes some app to think jpeg is a dvix video file
It was due to the merge of the qualcomm patches (patch: http://review.cyanogenmod.org/#/c/28960/ ) which was merged on the 23rd

Change-Id: Ida014adab4a954aa81a16d1ff401f9847f87d1a5
base: fix notifications

Change-Id: I0047e1e9c424f09e8d19f712169af03cb841d8f4
Add config_speed_up_audio_on_mt_calls option

Bug: 7612431
Change-Id: Ia2758f81b78a2576df8dd23c700dba3eaaef8efc

Conflicts:
	core/res/res/values/config.xml
Camera: add ISO mode support

Change-Id: Ied2075f950269990d836fc768b2c6c36088d494f
telephony: remove some log spam

* Left option for debugging.

Change-Id: I80e0cb2c358bd5a5f0f2a093c07c37dfa8107180
Phone: Sprint MWI Quirk: Phantom message wait indicator workaround (2/2)
Merge "Phone: Sprint MWI Quirk: Phantom message wait indicator workaround (2/2)" into jellybean
Merge "Add config_speed_up_audio_on_mt_calls option" into jellybean
GlobalActions: Fix dialog dismissal

The themeability of the global actions dialog introduced by
change I644e2e8d7d4abf07bae639b606197d691f16adac broke the
hook that prevented multiple instances of that dialog, and
multiple instances of it will cause framework crashes due to
mismatches variable references (besides looking weird).

Fix it by restoring the original dismissal condition and forcing
a recreation of the theme context if necessary.

Change-Id: Ic6e06bef18fa9e09c84c774fa273f1b7e3bf9630
Fixed aapt warnings

Change-Id: I35389697266b3ec59a38b4142a8983d0a8cc31ac
Services.jar  Fixed audio through 35MM headsets

Reworked updateStateLocked to recalculate the state recieved from
the kernel.  Updated to start on reboot or power up.

Change-Id: I44b041391b76496ee2b39d44a3a9ce2c7283325c
Merge "Services.jar  Fixed audio through 35MM headsets" into jellybean
Merge remote-tracking branch 'github/jellybean' into aosp
Merge remote-tracking branch 'napodan/aosp' into njb4.2