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

Commit b79a8226 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f am: 465363a3 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: Ieb1bf012ee0f735dcfc4d579eee9fc587bfbdbe1
parents 1b29155a 465363a3

src/com/android/settings/password/ChooseLockSettingsHelper.java

+1 −2
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ public final class ChooseLockSettingsHelper { 


    private static final String TAG = "ChooseLockSettingsHelper";



    public static final String EXTRA_KEY_TYPE = "type";

    public static final String EXTRA_KEY_PASSWORD = "password";

    public static final String EXTRA_KEY_RETURN_CREDENTIALS = "return_credentials";

    // Force the verifyCredential path instead of checkCredential path. This will be removed
@@ -191,7 +190,7 @@ public final class ChooseLockSettingsHelper { 
        /**

         * @param returnCredentials if true, puts the following credentials into intent for

         *                          onActivityResult with the following keys:

         *                          {@link #EXTRA_KEY_TYPE}, {@link #EXTRA_KEY_PASSWORD},

         *                          {@link #EXTRA_KEY_PASSWORD},

         *                          {@link #EXTRA_KEY_CHALLENGE_TOKEN},

         *                          {@link #EXTRA_KEY_GK_PW_HANDLE}

         *                          Note that if this is true, this can only be called internally.

src/com/android/settings/password/ConfirmLockPassword.java

+0 −6
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.os.Handler; 
import android.os.Looper;

import android.os.SystemClock;

import android.os.UserManager;

import android.os.storage.StorageManager;

import android.text.Editable;

import android.text.InputType;

import android.text.TextUtils;
@@ -445,11 +444,6 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
                        public void onChecked(boolean matched, int timeoutMs) {

                            mPendingLockCheck = null;

                            if (matched && isInternalActivity() && mReturnCredentials) {

                                // TODO: get rid of EXTRA_KEY_TYPE, since EXTRA_KEY_PASSWORD already

                                // distinguishes beteween PIN and password.

                                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE,

                                                mIsAlpha ? StorageManager.CRYPT_TYPE_PASSWORD

                                                         : StorageManager.CRYPT_TYPE_PIN);

                                intent.putExtra(

                                        ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, credential);

                            }

src/com/android/settings/password/ConfirmLockPattern.java

+0 −3
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.os.Bundle; 
import android.os.CountDownTimer;

import android.os.SystemClock;

import android.os.UserManager;

import android.os.storage.StorageManager;

import android.text.TextUtils;

import android.view.LayoutInflater;

import android.view.MotionEvent;
@@ -506,8 +505,6 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
                            public void onChecked(boolean matched, int timeoutMs) {

                                mPendingLockCheck = null;

                                if (matched && isInternalActivity() && mReturnCredentials) {

                                    intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE,

                                                    StorageManager.CRYPT_TYPE_PATTERN);

                                    intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,

                                                    pattern);

                                }