From 9691d4224c35390ab1a53792f0cb3b1dfb6679b6 Mon Sep 17 00:00:00 2001 From: d34d Date: Wed, 9 Dec 2015 10:43:41 -0800 Subject: [PATCH] Keyguard: Introduce 3rd party keyguard perms and utils For CM13, the third party keyguard permission is being added to the cmsdk rather than frameworks/base. This patch also introduces CmLockPatternUtils, a subclass of LockPatternUtils, which allows us to make use of the new third party keyguard permissions in cmsdk. Change-Id: I91fadfaae79e3f146e9ae73929cea91294ef8d87 --- cm/res/AndroidManifest.xml | 6 ++ cm/res/res/values/strings.xml | 5 ++ .../internal/util/CmLockPatternUtils.java | 85 +++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 src/java/org/cyanogenmod/internal/util/CmLockPatternUtils.java diff --git a/cm/res/AndroidManifest.xml b/cm/res/AndroidManifest.xml index 8a668d1..42a5d9c 100644 --- a/cm/res/AndroidManifest.xml +++ b/cm/res/AndroidManifest.xml @@ -135,6 +135,12 @@ android:description="@string/permdesc_protectedApp" android:protectionLevel="signature|privileged" /> + + + Use outdoor settings only LiveDisplay can help reduce eyestrain and help you sleep at night. Click here to try it out! + + third party lock screen + + Allows an app to be used as an insecure lock screen. + diff --git a/src/java/org/cyanogenmod/internal/util/CmLockPatternUtils.java b/src/java/org/cyanogenmod/internal/util/CmLockPatternUtils.java new file mode 100644 index 0000000..9c8b9df --- /dev/null +++ b/src/java/org/cyanogenmod/internal/util/CmLockPatternUtils.java @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2015 The CyanogenMod Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.cyanogenmod.internal.util; + +import android.content.ComponentName; +import android.content.Context; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.os.UserHandle; +import android.text.TextUtils; + +import com.android.internal.widget.LockPatternUtils; + +import cyanogenmod.platform.Manifest; + +public class CmLockPatternUtils extends LockPatternUtils { + + /** + * Third party keyguard component to be displayed within the keyguard + */ + public static final String THIRD_PARTY_KEYGUARD_COMPONENT = "lockscreen.third_party"; + + private Context mContext; + + public CmLockPatternUtils(Context context) { + super(context); + mContext = context; + } + + /** + * Sets a third party lock screen. + * @param component + */ + public void setThirdPartyKeyguard(ComponentName component) + throws PackageManager.NameNotFoundException { + if (component != null) { + // Check that the package this component belongs to has the third party keyguard perm + final PackageManager pm = mContext.getPackageManager(); + final boolean hasThirdPartyKeyguardPermission = pm.checkPermission( + Manifest.permission.THIRD_PARTY_KEYGUARD, component.getPackageName()) == + PackageManager.PERMISSION_GRANTED; + if (!hasThirdPartyKeyguardPermission) { + throw new SecurityException("Package " + component.getPackageName() + " does not" + + "have " + Manifest.permission.THIRD_PARTY_KEYGUARD); + } + } + + setString(THIRD_PARTY_KEYGUARD_COMPONENT, + component != null ? component.flattenToString() : "", getCurrentUser()); + } + + /** + * Get the currently applied 3rd party keyguard component + * @return + */ + public ComponentName getThirdPartyKeyguardComponent() { + String component = getString(THIRD_PARTY_KEYGUARD_COMPONENT, getCurrentUser()); + return component != null ? ComponentName.unflattenFromString(component) : null; + } + + /** + * @return Whether a third party keyguard is set + */ + public boolean isThirdPartyKeyguardEnabled() { + String component = getString(THIRD_PARTY_KEYGUARD_COMPONENT, getCurrentUser()); + return !TextUtils.isEmpty(component); + } + + private int getCurrentUser() { + return UserHandle.USER_CURRENT; + } +}