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

Commit 852ee8e4 authored by Eric Biggers's avatar Eric Biggers Committed by Gerrit Code Review
Browse files

Merge changes from topic "locksettings-aosp-first" into main 

* changes:
  Log errors in verifyChallengeInternal()
  Remove obsolete comment about isVisiblePatternEnabled()
  Enable visual feedback when entering FRP pattern
  Make locksettings commands go through "cmd lock_settings"
  Remove LockPatternUtils.setVisiblePasswordEnabled()
parents b99205f8 aa19b222

cmds/locksettings/Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ package { 
    default_applicable_licenses: ["frameworks_base_license"],

}



java_binary {

sh_binary {

    name: "locksettings",

    wrapper: "locksettings.sh",

    srcs: ["**/*.java"],

    src: "locksettings.sh",

}

cmds/locksettings/locksettings.sh

+1 −5
Original line number Diff line number Diff line 
#!/system/bin/sh

# Script to start "locksettings" on the device

#

base=/system

export CLASSPATH=$base/framework/locksettings.jar

exec app_process $base/bin com.android.commands.locksettings.LockSettingsCmd "$@"
 
cmd lock_settings "$@"

cmds/locksettings/src/com/android/commands/locksettings/LockSettingsCmd.java

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source 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 com.android.commands.locksettings;



import android.os.ResultReceiver;

import android.os.ServiceManager;

import android.os.ShellCallback;



import com.android.internal.os.BaseCommand;

import com.android.internal.widget.ILockSettings;



import java.io.FileDescriptor;

import java.io.PrintStream;



public final class LockSettingsCmd extends BaseCommand {



    public static void main(String[] args) {

        (new LockSettingsCmd()).run(args);

    }



    @Override

    public void onShowUsage(PrintStream out) {

        main(new String[] { "help" });

    }



    @Override

    public void onRun() throws Exception {

        ILockSettings lockSettings = ILockSettings.Stub.asInterface(

                ServiceManager.getService("lock_settings"));

        lockSettings.asBinder().shellCommand(FileDescriptor.in, FileDescriptor.out,

                FileDescriptor.err, getRawArgs(), new ShellCallback(), new ResultReceiver(null) {});

    }

}

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

+1 −8
Original line number Diff line number Diff line
@@ -986,7 +986,7 @@ public class LockPatternUtils { 
     */

    @UnsupportedAppUsage

    public boolean isVisiblePatternEnabled(int userId) {

        return getBoolean(Settings.Secure.LOCK_PATTERN_VISIBLE, false, userId);

        return getBoolean(Settings.Secure.LOCK_PATTERN_VISIBLE, true, userId);

    }



    /**
@@ -1021,13 +1021,6 @@ public class LockPatternUtils { 
        return getString(LOCK_PIN_ENHANCED_PRIVACY, userId) != null;

    }



    /**

     * Set whether the visible password is enabled for cryptkeeper screen.

     */

    public void setVisiblePasswordEnabled(boolean enabled, int userId) {

        // No longer does anything.

    }



    /**

     * Set and store the lockout deadline, meaning the user can't attempt their unlock

     * pattern until the deadline has passed.

services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java

+2 −0
Original line number Diff line number Diff line
@@ -1327,8 +1327,10 @@ public class SyntheticPasswordManager { 
            }

            return result;

        } else if (responseCode == GateKeeperResponse.RESPONSE_RETRY) {

            Slog.e(TAG, "Gatekeeper verification of synthetic password failed with RESPONSE_RETRY");

            return VerifyCredentialResponse.fromTimeout(response.getTimeout());

        } else {

            Slog.e(TAG, "Gatekeeper verification of synthetic password failed with RESPONSE_ERROR");

            return VerifyCredentialResponse.ERROR;

        }

    }