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

Commit 044887da authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev am:... 

Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev am: 2cd733dc am: d208da65

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



Change-Id: I815b5f1af564e64e73cbc352b7b1cd233bd64537
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8a932c81 d208da65

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

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ import android.view.KeyEvent; 
import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.view.WindowManager;

import android.view.inputmethod.EditorInfo;

import android.widget.ImeAwareEditText;

import android.widget.TextView;
@@ -214,6 +215,7 @@ public class ChooseLockPassword extends SettingsActivity { 
        ThemeHelper.trySetDynamicColor(this);

        super.onCreate(savedInstanceState);

        findViewById(R.id.content_parent).setFitsSystemWindows(false);

        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);

    }



    public static class ChooseLockPasswordFragment extends InstrumentedFragment

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

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.view.LayoutInflater; 
import android.view.MotionEvent;

import android.view.View;

import android.view.ViewGroup;

import android.view.WindowManager;

import android.widget.TextView;



import androidx.fragment.app.Fragment;
@@ -175,6 +176,7 @@ public class ChooseLockPattern extends SettingsActivity { 
        ThemeHelper.trySetDynamicColor(this);

        super.onCreate(savedInstanceState);

        findViewById(R.id.content_parent).setFitsSystemWindows(false);

        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);

    }



    @Override

tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java

+16 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC; 
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX;

import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;

import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;

import static android.view.WindowManager.LayoutParams.FLAG_SECURE;



import static com.android.internal.widget.LockPatternUtils.PASSWORD_TYPE_KEY;

import static com.android.settings.password.ChooseLockGeneric.CONFIRM_CREDENTIALS;
@@ -158,6 +159,21 @@ public class ChooseLockPasswordTest { 
                .isNotNull();

    }



    @Test

    public void activity_shouldHaveSecureFlag() {

        PasswordPolicy policy = new PasswordPolicy();

        policy.quality = PASSWORD_QUALITY_ALPHABETIC;

        policy.length = 10;



        Intent intent = createIntentForPasswordValidation(

                /* minMetrics */ policy.getMinMetrics(),

                /* minComplexity= */ PASSWORD_COMPLEXITY_NONE,

                /* passwordType= */ PASSWORD_QUALITY_ALPHABETIC);

        ChooseLockPassword activity = buildChooseLockPasswordActivity(intent);

        final int flags = activity.getWindow().getAttributes().flags;

        assertThat(flags & FLAG_SECURE).isEqualTo(FLAG_SECURE);

    }



    @Test

    public void processAndValidatePasswordRequirements_noMinPasswordComplexity() {

        PasswordPolicy policy = new PasswordPolicy();

tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings.password;



import static android.view.WindowManager.LayoutParams.FLAG_SECURE;



import static com.google.common.truth.Truth.assertThat;

import static com.google.common.truth.Truth.assertWithMessage;
@@ -107,6 +109,14 @@ public class ChooseLockPatternTest { 
        assertThat(iconView.getVisibility()).isEqualTo(View.GONE);

    }



    @Test

    public void activity_shouldHaveSecureFlag() {

        final ChooseLockPattern activity = Robolectric.buildActivity(

                ChooseLockPattern.class, new IntentBuilder(application).build()).setup().get();

        final int flags = activity.getWindow().getAttributes().flags;

        assertThat(flags & FLAG_SECURE).isEqualTo(FLAG_SECURE);

    }



    private ChooseLockPattern createActivity(boolean addFingerprintExtra) {

        return Robolectric.buildActivity(

                ChooseLockPattern.class,