Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66c492a8 authored by Lenka Trochtova's avatar Lenka Trochtova
Browse files

Add a feature flag for secure lock screen. 

Disable certain APIs which require secure lock screen if the device
doesn't have the feature.
Make sure one cannot set the password/PIN if there is no secure lock
screen, because the password/PIN wouldn't be really used afterwards
while the password strength checks would succeed, creating a false
sense of security.
Allow setting password strength requirements in DPM - test if the
current password is sufficient will fail automatically if there is
no secure lock screen.

Bug: 111072170
Bug: 111071972
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases
Test: cts-tradefed run cts -m CtsAdminTestCases
Test: frameworks/base/core/tests/utiltests/runtests.sh
Test: adb shell am instrument -w -e class com.android.internal.widget.LockPatternUtilsTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Test: atest SyntheticPasswordTests
Test: atest LockSettingsServiceTests
Test: atest LockSettingsShellCommandTest
Test: atest DevicePolicyManagerTest (for servicestests)

Change-Id: Ie46b0de6cb03c26dd05c05711c5c3b5e36a872df
parent c2888cbc

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11655,6 +11655,7 @@ package android.content.pm { 
    field public static final String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape";

    field public static final String FEATURE_SCREEN_PORTRAIT = "android.hardware.screen.portrait";

    field public static final String FEATURE_SECURELY_REMOVES_USERS = "android.software.securely_removes_users";

    field public static final String FEATURE_SECURE_LOCK_SCREEN = "android.software.secure_lock_screen";

    field public static final String FEATURE_SENSOR_ACCELEROMETER = "android.hardware.sensor.accelerometer";

    field public static final String FEATURE_SENSOR_AMBIENT_TEMPERATURE = "android.hardware.sensor.ambient_temperature";

    field public static final String FEATURE_SENSOR_BAROMETER = "android.hardware.sensor.barometer";

core/java/android/app/KeyguardManager.java

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.app; 
import android.Manifest;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresFeature;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.SystemService;
@@ -124,6 +125,7 @@ public class KeyguardManager { 
     *

     * @return the intent for launching the activity or null if no password is required.

     **/

    @RequiresFeature(PackageManager.FEATURE_SECURE_LOCK_SCREEN)

    public Intent createConfirmDeviceCredentialIntent(CharSequence title, CharSequence description) {

        if (!isDeviceSecure()) return null;

        Intent intent = new Intent(ACTION_CONFIRM_DEVICE_CREDENTIAL);
@@ -176,6 +178,7 @@ public class KeyguardManager { 
     * @throws IllegalStateException if the device has already been provisioned

     * @hide

     */

    @RequiresFeature(PackageManager.FEATURE_SECURE_LOCK_SCREEN)

    @SystemApi

    public Intent createConfirmFactoryResetCredentialIntent(

            CharSequence title, CharSequence description, CharSequence alternateButtonLabel) {
@@ -231,6 +234,7 @@ public class KeyguardManager { 
     * secure notifications cannot be shown if {@code false}

     * @hide

     */

    @RequiresFeature(PackageManager.FEATURE_SECURE_LOCK_SCREEN)

    @RequiresPermission(Manifest.permission.CONTROL_KEYGUARD_SECURE_NOTIFICATIONS)

    @SystemApi

    public void setPrivateNotificationsAllowed(boolean allow) {
@@ -249,6 +253,7 @@ public class KeyguardManager { 
     * By default, private notifications are allowed.

     * @hide

     */

    @RequiresFeature(PackageManager.FEATURE_SECURE_LOCK_SCREEN)

    @RequiresPermission(Manifest.permission.CONTROL_KEYGUARD_SECURE_NOTIFICATIONS)

    @SystemApi

    public boolean getPrivateNotificationsAllowed() {

core/java/android/app/admin/DevicePolicyManager.java

+91 −1

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/content/pm/PackageManager.java

+8 −0
Original line number Diff line number Diff line
@@ -2058,6 +2058,14 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_BROADCAST_RADIO = "android.hardware.broadcastradio";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device has a secure implementation of keyguard, meaning the

     * device supports PIN, pattern and password as defined in Android CDD

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_SECURE_LOCK_SCREEN = "android.software.secure_lock_screen";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device includes an accelerometer.

core/java/com/android/internal/widget/LockPatternUtils.java

+29 −0

File changed.

Preview size limit exceeded, changes collapsed.