WIFI: Fix wimax teardown when wifi connected

Due to patch:
https://github.com/CyanogenMod/android_frameworks_base/commit/f769f4cbc2aaac8d9d49f9ff79a6fe0affc4ff6e

Change-Id: I18e5ced62c8e4976f7a6835ba8c593930dac0586
Global Settings (MSIM): Add global settings for naming sim cards

Change-Id: Ibbd0d48042a92f82241a4ccaee12a81ca13ccdb4
core: Improve strings

* Follow the guidelines

Change-Id: If4dbfe00036d65dc56b7852ec5ddbfbe72c921a0

Conflicts:
	core/res/res/values/cm_strings.xml
keyguard: fix chopped layout on hdpi msim devices

* adapted from commit fa06992ab7e49fe1e056787dd281384d92290be1

Change-Id: I23ebb212c96e3ef8aecebb43760cbea7d441b1fd
radio: Treat REGULAR_DEACTIVATION events as transient errors on AT&T

Change-Id: I6872be05de01dbe41d923f4274b70414f65d5f7e
MultiSim: move getFormattedSimName() to frameworks (2/2)

Move this into one location any app can call.

Change-Id: I02a96f72be1e41783faeb5862cb26b96ca776672
Signed-off-by: Roman Birg <roman@cyngn.com>
Add system|signature permission for intercepting package launch.

The preLaunchCheck (add, remove) functions which allows an application to
perform any checks before the framework launches the app
needs to be a protected with a system|signature permission.
This change defines the permission and protects the functions with it.

Change-Id: Ib62e25b780df39c4a7d9d1e4eaf3fc98ffa4089c

Conflicts:
	core/res/AndroidManifest.xml
PackageManager: Add configuration APIs for pre-launch checks

This change replaces overlays with an audited set() API, allowing
application with INTERCEPT_PACKAGE_LAUNCH permission to bootstrap
themselves.

Additionally, checks have been added to ensure that the custom prelaunch
check activity always resolves to a valid target.

Change-Id: I7f6be647fde3ce4ed699e6abfbe0392176ec96d3
Automatic translation import

Change-Id: Idfc4f2ffb3420870742c010835aaf0a057585296
Expand android.permission.WRITE_THEMES to system|signature

Change-Id: I5dd3dc7ea09276227a47f72f8a1c1f312354ddb8
Add API for protected SMS receive broadcasts.

  - Allows an application to receive an sms (usually for auth
  or registration) from whitelisted addresses, without broadcasting
  to any other listeners.

  - Allows an application to modify the whitelisted addresses within
  System.Secure settings.

Change-Id: I5dfeb94832eefac9607070e9fb29db589bac7a57

Conflicts:
	packages/SettingsProvider/res/values/defaults.xml
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
Make people lookup default overlay

Change-Id: I6dd7267bc82d33e04d99024e4dfb193f071d4f97
Framework: Speaker proximity only while in call (1/3)

Gives the option to only enable the speaker proximity
        feature during incall (speaker won't turn on
        while the phone is ringing, but will turn on
        after you remove the phone from your face, only
        after the receiving party has answered the call).

Change-Id: I3464f256c9b085b515f3614132eb76d3db04e41b

Conflicts:
	core/java/android/provider/Settings.java
Framework: Enable Speaker on Proximity (1/3)

restoring abandoned commit from:
    https://gerrit.slimroms.net/#/c/15838/

Change-Id: I7f59306814d67d36cfc27c2ce9a64c242bd6581d

Conflicts:
	core/java/android/provider/Settings.java
SettingsProvider: fix load protected sms setting logic

The method assumed a string resource, but we are working with
string-arrays.

Change-Id: I7d03821c5f5ac5d24445e5c03f7911c3a81c16dd
Signed-off-by: Roman Birg <roman@cyngn.com>