PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If backup service is not available, remove Settings->Backup and Backup->"Backup is disabled by

Browse Source 
admin" from search results.

"Backup -> Backup" still appears due to the PrivacySettingsActivity. On clicking that,
we get "Backup is disabled by admin" which is OK

Bug: 129743816

Test: 1. atest -v UserBackupSettingsActivityTest
2. atest -v BackupInactivePreferenceControllerTest
3. Create and switch to secondary user. Type "backup" in settings search. Note that only
"Backup->Backup" is shown and on clicking it, we get "Backup is disabled by admin"

Change-Id: Ic13e2d745c9511cbebe27aa4c6f5cd89b277fc37
This commit is contained in:
Chandan Nath
2019-04-10 17:02:02 +01:00
parent 96b534951c
commit 826a91c56e
6 changed files with 56 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java
View File

@@ -31,8 +31,10 @@ import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import static com.android.settings.backup.UserBackupSettingsActivityTest.ShadowBackupSettingsHelper;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowPrivacySettingsUtils.class})
@Config(shadows = {ShadowPrivacySettingsUtils.class, ShadowBackupSettingsHelper.class})
public class BackupInactivePreferenceControllerTest {
private Context mContext;
private BackupInactivePreferenceController mController;
@@ -48,18 +50,32 @@ public class BackupInactivePreferenceControllerTest {
@After
public void tearDown() {
ShadowPrivacySettingsUtils.reset();
ShadowBackupSettingsHelper.reset();
}
@Test
public void getAvailabilityStatus_isnotInvisibleKey_shouldBeAvailable() {
public void getAvailabilityStatus_isnotInvisibleKey_showBackup_shouldBeAvailable() {
ShadowPrivacySettingsUtils.setIsInvisibleKey(false);
ShadowBackupSettingsHelper.showBackupSettingsForUser = true;
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
public void getAvailabilityStatus_isnotInvisibleKey_dontShowBackup_shouldBeUnsearchable() {
ShadowPrivacySettingsUtils.setIsInvisibleKey(false);
ShadowBackupSettingsHelper.showBackupSettingsForUser = false;
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
}
@Test
public void getAvailabilityStatus_isInvisibleKey_shouldBeDisabledUnsupported() {
ShadowPrivacySettingsUtils.setIsInvisibleKey(true);
ShadowBackupSettingsHelper.showBackupSettingsForUser = true;
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
}