Prevent factory reset for short passwords in CryptKeeper

Since patterns and passwords can't be shorter than 4
elements, we shouldn't count them against attempts to unlock
the device.  If we do, we risk resetting the device
due to stray input.

Bug: 18211475
Bug: 18273380

Change-Id: Ib329cd3383471483cda68bfac4278b17d0c09c57

Conflicts:
	src/com/android/settings/CryptKeeper.java

Conflicts:
	src/com/android/settings/CryptKeeper.java
Merge tag 'android-5.0.1_r1' into lp

Android 5.0.1 release 1
Settings: Fix no preferred APN

Add preferred APN if found no match.

CRs-Fixed: 748830

Change-Id: Ibecf88a3e6236de13a0a4291438a6e62159a05e0
Setting: add app move to external storage

Add support tp move APP to external storage.

Change-Id: I9d8fef2df2f36b4d8b611d8ffe87990407b44742
Bluetooth: Refresh UI after checkbox is Unchecked.

 - Refresh list of auto-connectible profiles when
   Checkbox is unchecked in disconnected state.

Change-Id: Iddca04cbb06262556ea7decb39279df26e358eb6
CRs-Fixed: 758480
Revert "wlan: Provide runtime option to enable or disable rssi threshold (settings)"

This reverts commit d6b8cbb12629562edad5915a1273f87438215c73.

RSSI threshold parameters are now user configurable.Below are the
parameters.
THRESHOLD_UNBLACKLIST_HARD_5G
THRESHOLD_UNBLACKLIST_SOFT_5G
THRESHOLD_UNBLACKLIST_HARD_24G
THRESHOLD_UNBLACKLIST_SOFT_24G
THRESHOLD_INITIAL_AUTO_JOIN_ATTEMPT_RSSI_MIN_5G
THRESHOLD_INITIAL_AUTO_JOIN_ATTEMPT_RSSI_MIN_24G
Hence reverting the gerrit

Change-Id: If40cc281f8d13a9c3255e4306db45bc3ef4002ac
CRs-Fixed: 757958
Bluetooth: GAP: Handled scan mode during first time BT On

As the discoverability time out concept changed as per the
new design and this code snippet "setting scan mode to
connectable only when endtimestamp is null" is not
applicable.DUT remains in only connectable mode
if user remains in the settings menu.

Change-Id: I7aa2ea7d23c4a47f716e2c0645b2ad73018ada39
CRs-fixed: 714578
Bluetooth: Don't Initiate Connection if UUID not updated

 - if UUIDs are not updated don't initiate profile connection
 - add new profiles to already existing list
 -  don't delete profiles from the existing list

CRs-Fixed: 717840

Change-Id: Id71a5aad59f4004c262f3ad17f34fa0574654170
Bluetooth: Enable Page and Inquiry Scan.

When Bluetooth Setting is in foreground enable both
Page Scan and Inquiry Scan.
Changes made to make device both in connectable and
discoverable if user is in Bluetooth setting menu.
CRs-Fixed: 753990

Change-Id: I2d72ce3192f6b7fa9eb6beb5a175a3e732dac5a8
Bluetooth: GAP: Reset Alias name during virtual unplug

As per this fix Alias name get resetted when hid virtual
unplug initiated from HID device.

Change-Id: Idb1cba447072fd70c21cfecef8776b2baaf730bc
CRs-Fixed: 754689
Bluetooth: Security: Add Null check during pairing cancel intent.

Added null check, so before posing event we can restrict events,
if cached device list is empty

Change-Id: I458d181abe5eec2497b80b1713ddbc3502b79786
CRs-Fixed: 546364
(cherry picked from commit 7d7222c3e5c1054b4e2f3e59cc40cb182a72b040)
(cherry picked from commit 8ce523155dd030d82c32cf502d317023b017645b)
(cherry picked from commit 938686e749bca911e5f63150223116d1c381da8e)
Bluetooth: GAP: Handled Null pointer deference in unregisterReceiver

Handled Null pointer deference in unregisterReceiver event of
pairing dialog

Change-Id: Ie0d0561cb3c0f09a018e1aeb20579700c6e8d783
CRs-fixed: 761872
Bluetooth: Add Manifest configure to fix settings crash issue.

Settings is crashed when press back key after rotating screen when
Bluetooth profile activity is opened. Add manifest configure to
enable screen orientation feature.

Change-Id: I4550b18383d817d1a2f46fbeebda8a3bdab580c6
CRs-Fixed: 762437
Settings App: Fix to resolve NULL pointer exceptions

This fix resolves any NULL pointer exceptions and
Array Index Out of Bounds exceptions seen in
Settings Application code space.

CRs-Fixed: 760115
Change-Id: I8c2b7b8e19d362a5c5789d8693bcd3656c32e38d
Remove the System updates setting

Change-Id: Iacf68e7d909e876a009d2dd46df453bdecf6e563
Black & Grey
Merge https://github.com/AndroidOpenDevelopment/android_packages_apps_Settings into HEAD

Conflicts:
	res/xml/device_info_settings.xml