Projects >> platform_packages_apps_settings >>e63322f640cf955ba296e064b07e4920d334f851

Chunk
Conflicting content
        setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);
        findViewById(R.id.cancel_button).setOnClickListener(this);
        findViewById(R.id.learn_more_button).setOnClickListener(this);
<<<<<<< HEAD
        final double passwordQuality = new ChooseLockSettingsHelper(this).utils()
=======
        final int passwordQuality = new ChooseLockSettingsHelper(this).utils()
>>>>>>> f90628c6ec8cf80b44b9559db448eb9537b41fdc
                .getActivePasswordQuality(UserHandle.myUserId());
        mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
    }
Solution content
        setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);
        findViewById(R.id.cancel_button).setOnClickListener(this);
        findViewById(R.id.learn_more_button).setOnClickListener(this);
        final int passwordQuality = new ChooseLockSettingsHelper(this).utils()
                .getActivePasswordQuality(UserHandle.myUserId());
        mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
    }
File
FingerprintEnrollIntroduction.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable