camera: disable face recognition temporarily (intervigilium)
Add Facebook contact sync support (1/2)

Change-Id: I4cf4356abced3daa9728429e25112b2f5da8799e
BLN frameworks-part
BLN quiet hours part
    patch made by Rdlgrmpf, Robin Morawetz for IceColdSandwich for Desire HD
Profiles - Part 2 of 2

Frameworks support for Profiles.  Ported from CM7 with some ICS related
updates.

Patch set 3 - Adds Phone Rintone and Vibrate intercepts
Patch set 4 - Minor cleanup

Change-Id: I580aed32b714af8497ede39e0905fb327531bf1c

Conflicts:

	core/java/android/app/ContextImpl.java
	core/res/res/values/strings.xml
	media/java/android/media/RingtoneManager.java
	policy/src/com/android/internal/policy/impl/GlobalActions.java
Profiles: Sort profiles alphabetically

Change-Id: I23a460d5dcbfc8b20bc2a406586b39686b83a427

Conflicts:

	core/java/android/app/Profile.java
Fix profile text in global action menu

Change-Id: I655c0cfdfa6d84bc2039f62bcf4470750ae9ffa4

Conflicts:

	core/res/res/values/strings.xml
Profiles: Addition of Wimax (1/2) + Logic Cleanup

Change-Id: I4277e1982fb46637291ccba7e0d959c770cc623f
Profiles: Case insensitive duplicate name checking

 - Prevents duplicate names such as Default/default

Change-Id: I479a34192295677653985a66b05becb2d1b6cdf3
profiles: Add support for disabling screen lock

 * We can now have the option of disabling lockscreen security as part
   of the profile. A good use case for this is to create "Car" profile.
   You certainly don't want to input a pattern, or worse, face-unlock if
   you should happen to break the law and use your phone whilst driving.
 * Profile system now permits insecure mode or entirely disabling
   lockscreen as an override.
 * Fix issue where changes aren't applied if the active profile is
   modified.
 * Also fix a couple of string-comparison derps.

Change-Id: I07a09b7011bad4f32cdd7bfa576e3befa71193ea
profiles: Fix "disabled" lock screen mode

Without this fix, it's impossible to select the "Disabled" lock screen
mode.

Change-Id: I214f52093d78631f799a604394e838a4b329494a
Profiles: UI/UX consistency and cleanup (Part 2 of 2)

This commit contains the frameworks support for the modified Profiles
and Application Groups settings functionality, ensuring consistency between
the two.

1) Add ability to rename Application groups
2) Add duplicate name checking for app groups

Change-Id: Ifcf2eb5f6aa26e0d4778b32c1a35bfb88fac318b
Profiles: add sync and mobile data override (1/2)

Change-Id: I93fe2af38b3fe49c1aa555cf5f27c366fd38ab91
Update profile drawables

Change-Id: Ie139f113fe63008c88e39a7e15353472130d4dc9
Add multiple UUID tags to profile (1/2 Frameworks)

Adding multiple UUID tags to a profile allows us to share a single NFC tag across multiple devices.

NFC tag writing works as before.
NFC tag reading is expanded to check the UUID and the UUID tags of a profile.

When reading unknown profiles, the user is asked to attach the tag to an exising profile.
The NFC tag itself stays untouched.

Patch Set 1:
* initial commit

Patch Set 2:
* rebase
* remove getProfileByTag() and use getProfile()
* rename tag to secondary uuid

Patch Set 3:
* rename "tag" leftovers

Change-Id: I284f8a823ced48d3b88ce3b3a1e83152cb145d2d
fix build
Add @hide to new fields/methods

Change-Id: I084485bbe6b738ed90a72b787d842688b38b3bef

Conflicts:

	core/java/android/app/Profile.java
Add hidable kill-all-button to recent switcher

Signed-off-by: Robin Morawetz <robin.morawetz@googlemail.com>
frameworks/base: add hot reboot support to reboot options (Evervolv)

    Conflicts:

    	core/java/com/android/internal/app/ShutdownThread.java
ActivityManagerService: stay away from zombie content providers

When the lowmemorykiller kills a content provider in an unfortunate
moment, an innocent client app can become attached to a zombie provider
and be unconditionally killed moments after, when the dead provider is
being removed.
Prevent this race by addition of isAlive function to Process.java that
determines whether a process is still running and is not only a zombie,
add a check of the state of the provider process to getContentProviderImpl.

Change-Id: Id753b8dab103e4b447c4138468938ca9f5cb857d
Don't consider input restricted if keyguard is still disabled.

Change-Id: I00a351311d0933fe326bda33f5c988a6232cca16