From 72dfff957a617a0170bbe19d5206e6f7f8b0d3b6 Mon Sep 17 00:00:00 2001 From: Michal Karpinski Date: Thu, 27 Apr 2017 11:19:04 +0100 Subject: [PATCH] Fix BackupSettingsTest (update blacklist) Added Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED to the blacklist as a candidate for backup. Bug: 37684646 Test: mmma -j40 frameworks/base/core/tests/coretests, then adb install -r ${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreTests/FrameworksCoreTests.apk, then adb shell am instrument -w -e class android.provider.SettingsBackupTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner Change-Id: I51e00062dc570992f391d7a052e6627865f73327 --- .../tests/coretests/src/android/provider/SettingsBackupTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 2959d7699ac69..7933d77ce2dba 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -403,6 +403,7 @@ public class SettingsBackupTest { Settings.Secure.BACKUP_PROVISIONED, Settings.Secure.BACKUP_TRANSPORT, Settings.Secure.BLUETOOTH_HCI_LOG, + Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, // Candidate for backup? Settings.Secure.CARRIER_APPS_HANDLED, Settings.Secure.CMAS_ADDITIONAL_BROADCAST_PKG, Settings.Secure.COMPLETED_CATEGORY_PREFIX,