summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
diff options
context:
space:
mode:
authorAlexandra Gherghina <alexgherghina@google.com>2014-04-12 08:42:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-12 08:42:40 +0000
commit8bed355237b81c4f2181196ddfccda418bd2556b (patch)
tree55fe708d5757827f3291b388a4426ce947dd9826 /packages/Keyguard
parent0bccdd85d3d5d41c82018bc630588e8fd88e9578 (diff)
parentbd924d2e6174024ca760ae3e53ca1e24c91cf0a6 (diff)
downloadframeworks_base-8bed355237b81c4f2181196ddfccda418bd2556b.zip
frameworks_base-8bed355237b81c4f2181196ddfccda418bd2556b.tar.gz
frameworks_base-8bed355237b81c4f2181196ddfccda418bd2556b.tar.bz2
am bd924d2e: Merge "Revert "Mark the keyguard package as required for profile""
* commit 'bd924d2e6174024ca760ae3e53ca1e24c91cf0a6': Revert "Mark the keyguard package as required for profile"
Diffstat (limited to 'packages/Keyguard')
-rw-r--r--packages/Keyguard/AndroidManifest.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/Keyguard/AndroidManifest.xml b/packages/Keyguard/AndroidManifest.xml
index 75b7dbd..b2d2ec5 100644
--- a/packages/Keyguard/AndroidManifest.xml
+++ b/packages/Keyguard/AndroidManifest.xml
@@ -44,8 +44,7 @@
<application android:label="@string/app_name"
android:process="com.android.systemui"
android:persistent="true"
- android:supportsRtl="true"
- android:requiredForProfile="all">
+ android:supportsRtl="true">
<service android:name=".KeyguardService"
android:exported="true" />