Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat
base: properly check that quickboot is enabled

Change-Id: I0c9e54ee2cdf4efb5097cd101a0fa274f493d816
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Change-Id: I8a03eadd88965dd6b06aba1bdc8301176f538669
SystemUI: Expose heads up.

Signed-off-by: Roman Birg <roman@cyngn.com>
Signed-off-by: Adnan Begovic <adnan@cyngn.com>
Change-Id: I276cb1c80d392b7dbac28e5f553207415b558481

Conflicts:
	core/java/android/provider/Settings.java
	packages/SettingsProvider/res/values/defaults.xml
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
HeadsUp: Clean up.

Change-Id: I98f445e7a4c92a34a3d9f63e14135e92416875ff

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
accounts: don't remove accounts while device is in safe mode

Userspace apps are not available in safe mode, so authenticators are not available when
the system starts and checks all accounts. Just ignore these accounts and not add them
to the list of accounts.

JIRA: CYAN-4074
Issue: https://jira.cyanogenmod.org/browse/CYAN-4074
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Change-Id: I9cac5084c29fe33a0215ab4a9e693f58712438ac
Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat
Wifi: Use bss->age identifier for wifi scan results

This value will be used as "timestamp" and Google Play Services
uses this value for identifying sane wifi scan items.

The current timestamp (tsf=) has a different meaning, which causes
the Google Location Resolver to ignore all wifi scan entries and
therefore no location can be resolved.

This solution is already done on batched result parsing, but
missing on the traditional scans.

Change-Id: I36a1aeb666379e6a010298f09161e971012db83f
MountService: Handle UUID in list response

Change-Id: Ifee8905ae01c17c79b218ec131650c25f6e977d6
keyguard: force marquee effect for carrier text

This allows to make rooms for languages with long carrier text descriptions.

Change-Id: I8a3f69d186e79971c66c4977d258b2bda48ceeff
JIRA: CYAN-4356
Issue: https://jira.cyanogenmod.org/browse/CYAN-4356
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
PackageManager: Add option for single threaded dexopt

* Execute all dexopt invocations on the main thread instead of using the
  ExecutorService when persist.sys.dalvik.multithread is set to false.

Change-Id: I3b8499d5af5091ad7abcddf006f8f2837943903b
Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat
Themes: Use default_wallpaper for HOLO lockscreen wp

Change-Id: I9c7fd29c99d13e811993eb9b3b045010431ccad0
Revert "SystemUI: Expose heads up."

Signed-off-by: Roman Birg <roman@cyngn.com>
Signed-off-by: Adnan Begovic <adnan@cyngn.com>
Change-Id: I276cb1c80d392b7dbac28e5f553207415b558481

Conflicts:
	core/java/android/provider/Settings.java
	packages/SettingsProvider/res/values/defaults.xml
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java (reverted from commit dce369f03f119f0abb93269d2714c4461395cf1f)
Merge remote-tracking branch 'PA/kitkat' into kitkat-legacy-staging

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java