diff options
| author | d34d <clark@cyngn.com> | 2016-01-25 09:44:14 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-04-13 12:21:24 -0700 |
| commit | 10da08aa5e6982dcdbdb099c1bc27c3a3ac67e3f (patch) | |
| tree | e5b214c23e45d18fc0409aff2425a06d08fae150 /cm | |
| parent | ad0d8c53a0987e5877df5dfe30b7b7025cefffd0 (diff) | |
| download | vendor_cmsdk-10da08aa5e6982dcdbdb099c1bc27c3a3ac67e3f.zip vendor_cmsdk-10da08aa5e6982dcdbdb099c1bc27c3a3ac67e3f.tar.gz vendor_cmsdk-10da08aa5e6982dcdbdb099c1bc27c3a3ac67e3f.tar.bz2 | |
cmsdk: correct naming of THIRD_PARTY_KEYGUARD perm
Change-Id: If2d062a90db340f8415d12897b16667fc834a848
TICKET: CYNGNOS-1705
Diffstat (limited to 'cm')
| -rw-r--r-- | cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java | 5 | ||||
| -rw-r--r-- | cm/res/AndroidManifest.xml | 2 |
2 files changed, 6 insertions, 1 deletions
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" /> <!-- Allows an application to be used as a third party keyguard --> - <permission android:name="android.permission.THIRD_PARTY_KEYGUARD" + <permission android:name="cyanogenmod.permission.THIRD_PARTY_KEYGUARD" android:label="@string/permlab_thirdPartyKeyguard" android:description="@string/permdesc_thirdPartyKeyguard" android:protectionLevel="normal" /> |