Projects information

Chunk

Conflicting content
* @return built instance of {@code KeyStoreParameter} */ public KeyStoreParameter build() { <<<<<<< HEAD return new KeyStoreParameter(mFlags, mKeyValidityStart, mKeyValidityForOriginationEnd, mKeyValidityForConsumptionEnd, mPurposes, mAlgorithm, mPadding, mDigest, mBlockMode, mMinSecondsBetweenOperations, mMaxUsesPerBoot, mUserAuthenticators, mUserAuthenticationValidityDurationSeconds, mInvalidatedOnNewFingerprintEnrolled); ======= return new KeyStoreParameter(mFlags, mKeyValidityStart, mKeyValidityForOriginationEnd, mKeyValidityForConsumptionEnd, mPurposes, mAlgorithm, mPadding, mDigest, mBlockMode, mMinSecondsBetweenOperations, mMaxUsesPerBoot, mUserAuthenticators, mUserAuthenticationValidityDurationSeconds); >>>>>>> e7e705d49401ec86147a889f7dee2b342147d19b } } }

Conflicting content

         * @return built instance of {@code KeyStoreParameter}
         */
        public KeyStoreParameter build() {
<<<<<<< HEAD
            return new KeyStoreParameter(mFlags, mKeyValidityStart,
                    mKeyValidityForOriginationEnd, mKeyValidityForConsumptionEnd, mPurposes,
                    mAlgorithm, mPadding, mDigest, mBlockMode, mMinSecondsBetweenOperations,
                    mMaxUsesPerBoot, mUserAuthenticators,
                    mUserAuthenticationValidityDurationSeconds,
                    mInvalidatedOnNewFingerprintEnrolled);
=======
            return new KeyStoreParameter(mFlags,
                    mKeyValidityStart,
                    mKeyValidityForOriginationEnd,
                    mKeyValidityForConsumptionEnd,
                    mPurposes,
                    mAlgorithm,
                    mPadding,
                    mDigest,
                    mBlockMode,
                    mMinSecondsBetweenOperations,
                    mMaxUsesPerBoot,
                    mUserAuthenticators,
                    mUserAuthenticationValidityDurationSeconds);
>>>>>>> e7e705d49401ec86147a889f7dee2b342147d19b
        }
    }
}

Solution content
* @return built instance of {@code KeyStoreParameter} */ public KeyStoreParameter build() { return new KeyStoreParameter(mFlags, mKeyValidityStart, mKeyValidityForOriginationEnd, mKeyValidityForConsumptionEnd, mPurposes, mAlgorithm, mPadding, mDigest, mBlockMode, mMinSecondsBetweenOperations, mMaxUsesPerBoot, mUserAuthenticators, mUserAuthenticationValidityDurationSeconds, mInvalidatedOnNewFingerprintEnrolled); } } }

Solution content

         * @return built instance of {@code KeyStoreParameter}
         */
        public KeyStoreParameter build() {
            return new KeyStoreParameter(mFlags,
                    mKeyValidityStart,
                    mKeyValidityForOriginationEnd,
                    mKeyValidityForConsumptionEnd,
                    mPurposes,
                    mAlgorithm,
                    mPadding,
                    mDigest,
                    mBlockMode,
                    mMinSecondsBetweenOperations,
                    mMaxUsesPerBoot,
                    mUserAuthenticators,
                    mUserAuthenticationValidityDurationSeconds,
                    mInvalidatedOnNewFingerprintEnrolled);
        }
    }
}

File
KeyStoreParameter.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Return statement

Projects >> platform_frameworks_base >>7f5b87692b49a3ae674eda76d5fd77ab49b97409