Avoid NPE if icon assignment failed for whatever reason.

Change-Id: Iba4188d6b42179008154b8cbcbb14c36a22669de
appops first draft

PS2: vanir-ize a bit
PS3: fix a derp
PS4: move some things around
PS5: rebased

Change-Id: I7404e82731b2d23c77e63ec6f439cecea148c5e7
Signed-off-by: Dan Trifan <jimsth@gmail.com>
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	res/values/strings.xml
Make app ops more usable

gets rid of the arbitrary categories,
shows all operations, not just the ones that were in use

operations != permissions. app ops is not permission management

Change-Id: I8570bd14a4b739f33417442d23c400fd2d264904
Signed-off-by: Dan Trifan <jimsth@gmail.com>
optional encryption password sync (2/2)

Option to use 2 different tokens for encryption and locking.
Allows convenient usage and strong encryption at the same time.

Inspired by reading next:
https://santoku-linux.com/howto/mobile-forensics/how-to-brute-force-android-encryption

Related discussion:
http://code.google.com/p/android/issues/detail?id=29468

Change-Id: I71a31e7a04b84910d5be317e6f531c41d7ad002f
Signed-off-by: Dan Trifan <jimsth@gmail.com>
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	res/xml/security_settings_encrypted.xml
	src/com/android/settings/SecuritySettings.java
Merge branch 'jb43' of git://github.com/scotthartbti/android_packages_apps_Settings into beanstalk