436256c36d
Test: 1) make and run SettingsTests. It passes.
2) Manual test 1
a) On a device supports fingerprint, set a password but not fingerprint.
b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
c) Confirm Lock password screen is shown
d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
e) A new password can be set successfully.
3) Manual test 2
a) Repeat step 2)a) - 2)c)
b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
c) A new password and fingerprint can be enrolled successfully.
Bug: 33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
28 lines
620 B
Makefile
28 lines
620 B
Makefile
LOCAL_PATH:= $(call my-dir)
|
|
include $(CLEAR_VARS)
|
|
|
|
# We only want this apk build for tests.
|
|
LOCAL_MODULE_TAGS := tests
|
|
LOCAL_CERTIFICATE := platform
|
|
|
|
LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle
|
|
|
|
LOCAL_STATIC_JAVA_LIBRARIES := \
|
|
android-support-test \
|
|
mockito-target \
|
|
espresso-core \
|
|
espresso-contrib-nodep \
|
|
espresso-intents-nodep \
|
|
ub-uiautomator \
|
|
truth-prebuilt \
|
|
legacy-android-test
|
|
|
|
# Include all test java files.
|
|
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
|
|
|
LOCAL_PACKAGE_NAME := SettingsTests
|
|
|
|
LOCAL_INSTRUMENTATION_FOR := Settings
|
|
|
|
include $(BUILD_PACKAGE)
|