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

Commit bc5da644 authored by Rubin Xu's avatar Rubin Xu
Browse files

Add metrics for EXTRA_KEY_DEVICE_PASSWORD_REQUIREMENT_ONLY 

Bug: 169832516
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.password
Change-Id: I2bcd6c4f1a5f04582bb88ec9fb285621b9ec77eb
parent ff1b5475

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

+8 −1
Original line number Diff line number Diff line
@@ -162,6 +162,13 @@ public class SetNewPasswordActivity extends Activity implements SetNewPasswordCo 
                ? getIntent().getIntExtra(EXTRA_PASSWORD_COMPLEXITY, PASSWORD_COMPLEXITY_NONE)

                : Integer.MIN_VALUE;



        final boolean extraDevicePasswordRequirementOnly = getIntent().getBooleanExtra(

                EXTRA_DEVICE_PASSWORD_REQUIREMENT_ONLY, false);



        // Use 30th bit to encode extraDevicePasswordRequirementOnly, since the top bit (31th bit)

        // encodes whether EXTRA_PASSWORD_COMPLEXITY has been absent.

        final int logValue = extraPasswordComplexity

                | (extraDevicePasswordRequirementOnly ? 1 << 30 : 0);

        // this activity is launched by either ACTION_SET_NEW_PASSWORD or

        // ACTION_SET_NEW_PARENT_PROFILE_PASSWORD

        final int action = ACTION_SET_NEW_PASSWORD.equals(mNewPasswordAction)
@@ -175,6 +182,6 @@ public class SetNewPasswordActivity extends Activity implements SetNewPasswordCo 
                action,

                SettingsEnums.SET_NEW_PASSWORD_ACTIVITY,

                callingAppPackageName,

                extraPasswordComplexity);

                logValue);

    }

}

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

+7 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ public class SetNewPasswordActivityTest { 
    @Test

    @Config(shadows = {ShadowPasswordUtils.class})

    public void launchChooseLock_setNewParentProfilePassword_DevicePasswordRequirementExtra() {

        ShadowPasswordUtils.setCallingAppPackageName(PKG_NAME);

        Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),

                Settings.Global.DEVICE_PROVISIONED, 1);
@@ -328,6 +329,12 @@ public class SetNewPasswordActivityTest { 


        assertThat(actualIntent.getBooleanExtra(

                EXTRA_KEY_DEVICE_PASSWORD_REQUIREMENT_ONLY, false)).isTrue();

        verify(mockMetricsProvider).action(

                SettingsEnums.PAGE_UNKNOWN,

                SettingsEnums.ACTION_SET_NEW_PARENT_PROFILE_PASSWORD,

                SettingsEnums.SET_NEW_PASSWORD_ACTIVITY,

                PKG_NAME,

                Integer.MIN_VALUE | (1 << 30));

    }



    @Test