WindowManagerService: fix application transitions in expanded mode.

Change-Id: If7d3fc3ab566dedc3a5b38cd0a6dc3185f494e20
Fix a bootloop problem when /data/system/usagestats/usage-history.xml is empty.
This often occurs after an incomplete reboot/shutdown or battery pull.

Change-Id: I4f01151f4051df4ae1b85fa460ec7a9e70122878
Properly handle null URIs.

Change-Id: Ib81044686f40284bacf6ee645c671679f62be843
JIRA:CYAN-2491
base: added national roaming info for Play in Poland

Cherry-picked from OmniROM:
https://gerrit.omnirom.org/#/c/3382/

Users of Play in Poland (MCC 260 MNC 06) can roam on
Plus, T-Mobile, Orange (MNCs 01/02/03)

Change-Id: I8ea62b0ca40bac9ced11802ee8ef583d6392a199
Merge "Fix a bootloop problem when /data/system/usagestats/usage-history.xml is empty. This often occurs after an incomplete reboot/shutdown or battery pull." into cm-11.0
Merge "WindowManagerService: fix application transitions in expanded mode." into cm-11.0
Merge "base: added national roaming info for Play in Poland" into cm-11.0
Re-add expanded desktop tile.

Change-Id: I945455f4f0f2544cbce7fe38916fad3aec7972bc
Fix profile lockscreen override.

KeyStore.isEmpty() needs to be called under the system UID (as it needs
KeyStore's P_ZERO permission), otherwise it'll always return false.
Achieve that by moving the requireSecureKeyguard() implementation into
the DPM service.

Also take the opportunity to clean up the code a bit.

Change-Id: Ice648f2050f22ee5f27332f23a850f1e90befb94
Merge "Fix profile lockscreen override." into cm-11.0
Merge "Properly handle null URIs." into cm-11.0
Bluetooth: HID: Add support for HID Device Role

This patch adds the HID Device Role support in Bluetooth framework.
Also AIDL and callback related files for HID Device role are added
to provide interface for third party applications to communicate with
HID device Service.

Change-Id: Id03a362b7bcfa2e76056fa0197eaac12ce49b5a2
CRs-Fixed: 573086
OBEX: Reduce Obex MTU size for A2DP or SCO concurrency

Reduce Obex MTU to 8k from 64k when OPP send is tried with
SCO / A2DP streaming in progress, so that the continue
response for first complete Obex PUT packet is received
from SOC within 50 seconds time frame.

CRs-Fixed: 571865
Change-Id: I1eae114f57f2a92ee4b26c82d8f55fafe02775b8
Bluetooth: Changes for LPP and extended LE scan

This patch includes implementation of a new Bluetooth
Adapter named QBluetoothAdapter for implementing LE
specific tasks that the default adapter doesnt perform.
This patch also implements Low power proximity and extended
LE scan functionality based on service UUIDs.

CRs-Fixed: 581289
Change-Id: I63e0593f79c8929d4e18cee0472fcb401c8892e7
Merge branch 'cm-11.0' of https://github.com/lis4rd0/android_frameworks_base into HEAD
Fix SystemUI FC for HALO due to missing activity

Conflicts:
	packages/SystemUI/AndroidManifest.xml

Change-Id: I8ff13d1232e9fbf4ae6bb16f3e48e060e7a573ba
Halo: Add master switch to disable Halo (1/2)
-Port master switch from @Der-Schubi.
-Fixed Halo not showed at first notifiction pulldown.

Change-Id: I93b59da79c63c3154bec1dba4490e4f4447a1564

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java