95264455a1
accessibility_display_magnification_scale has a default value set, so the current check to see if it was already configured during restore always falsely returned true. Now, we compare it to the default value and only say it's configured if different from the default. Bug: 72737403 Test: 1) Manual d2d restore: a) Set non-default value on source -> correctly restores on target b) Default value on source -> correctly has default value on target c) Set non-default value in SUW during restore -> correctly does not override with value from source 2) Unit: atest SettingsHelperRestoreTest Change-Id: Ie0670aac7b4ce806ac7b8baef4eb15a7c40d5919
31 lines
914 B
Makefile
31 lines
914 B
Makefile
LOCAL_PATH:= $(call my-dir)
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_MODULE_TAGS := tests
|
|
|
|
# Note we statically link several classes to do some unit tests. It's not accessible otherwise
|
|
# because this test is not an instrumentation test. (because the target runs in the system process.)
|
|
LOCAL_SRC_FILES := $(call all-subdir-java-files) \
|
|
../src/com/android/providers/settings/SettingsState.java \
|
|
../src/com/android/providers/settings/SettingsHelper.java
|
|
|
|
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
|
|
|
|
LOCAL_JAVA_LIBRARIES := android.test.base
|
|
|
|
LOCAL_RESOURCE_DIR := frameworks/base/packages/SettingsProvider/res
|
|
|
|
LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.providers.settings
|
|
|
|
LOCAL_PACKAGE_NAME := SettingsProviderTest
|
|
LOCAL_PRIVATE_PLATFORM_APIS := true
|
|
|
|
LOCAL_MODULE_TAGS := tests
|
|
|
|
LOCAL_CERTIFICATE := platform
|
|
|
|
LOCAL_COMPATIBILITY_SUITE := device-tests
|
|
|
|
include $(BUILD_PACKAGE)
|