diff --git a/api/cm_current.txt b/api/cm_current.txt
index f3b5536..423eefb 100644
--- a/api/cm_current.txt
+++ b/api/cm_current.txt
@@ -674,7 +674,7 @@ package cyanogenmod.platform {
field public static final java.lang.String READ_MSIM_PHONE_STATE = "cyanogenmod.permission.READ_MSIM_PHONE_STATE";
field public static final java.lang.String READ_THEMES = "cyanogenmod.permission.READ_THEMES";
field public static final java.lang.String READ_WEATHER = "cyanogenmod.permission.READ_WEATHER";
- field public static final java.lang.String THIRD_PARTY_KEYGUARD = "android.permission.THIRD_PARTY_KEYGUARD";
+ field public static final java.lang.String THIRD_PARTY_KEYGUARD = "cyanogenmod.permission.THIRD_PARTY_KEYGUARD";
field public static final java.lang.String WRITE_ALARMS = "cyanogenmod.permission.WRITE_ALARMS";
field public static final java.lang.String WRITE_DATAUSAGE = "cyanogenmod.permission.WRITE_DATAUSAGE";
field public static final java.lang.String WRITE_SECURE_SETTINGS = "cyanogenmod.permission.WRITE_SECURE_SETTINGS";
diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java
index c7c6bd2..8581162 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java
@@ -60,6 +60,9 @@ public class LiveLockScreenServiceBroker extends SystemService {
private static final long SERVICE_CONNECTION_WAIT_TIME_MS = 4 * 1000L; // 4 seconds
+ private static final String DEPRECATED_THIRD_PARTY_KEYGUARD_PERMISSION =
+ "android.permission.THIRD_PARTY_KEYGUARD";
+
private Context mContext;
// The actual LLS service to invoke
private ILiveLockScreenManagerProvider mService;
@@ -382,6 +385,8 @@ public class LiveLockScreenServiceBroker extends SystemService {
final PackageManager pm = mContext.getPackageManager();
final boolean hasThirdPartyKeyguardPermission = pm.checkPermission(
Manifest.permission.THIRD_PARTY_KEYGUARD,
+ llsInfo.component.getPackageName()) == PackageManager.PERMISSION_GRANTED
+ || pm.checkPermission(DEPRECATED_THIRD_PARTY_KEYGUARD_PERMISSION,
llsInfo.component.getPackageName()) == PackageManager.PERMISSION_GRANTED;
if (!hasThirdPartyKeyguardPermission) {
Slog.e(TAG, "Package " + llsInfo.component.getPackageName() +
diff --git a/cm/res/AndroidManifest.xml b/cm/res/AndroidManifest.xml
index c8fc50a..c2be8dc 100644
--- a/cm/res/AndroidManifest.xml
+++ b/cm/res/AndroidManifest.xml
@@ -139,7 +139,7 @@
android:protectionLevel="signature|privileged" />
-
diff --git a/samples/externalviews/keyguardviewprovider/AndroidManifest.xml b/samples/externalviews/keyguardviewprovider/AndroidManifest.xml
index 293c6b8..75a80bd 100644
--- a/samples/externalviews/keyguardviewprovider/AndroidManifest.xml
+++ b/samples/externalviews/keyguardviewprovider/AndroidManifest.xml
@@ -22,7 +22,7 @@
-
+