Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d5eff97 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Check manifest if runtime state of app is DEFAULT"

parents ef0a261d 7307e645

services/backup/java/com/android/server/backup/utils/AppBackupUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -126,7 +126,8 @@ public class AppBackupUtils { 
            case PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER:

            case PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED:

                return true;



            case PackageManager.COMPONENT_ENABLED_STATE_DEFAULT:

                return !app.enabled;

            default:

                return false;

        }

services/tests/servicestests/src/com/android/server/backup/utils/AppBackupUtilsTest.java

+34 −0
Original line number Diff line number Diff line
@@ -213,6 +213,40 @@ public class AppBackupUtilsTest { 
        assertThat(isEligible).isFalse();

    }



    @Test

    public void appIsDisabled_stateDefaultManifestEnabled_returnsFalse() throws Exception {

        ApplicationInfo applicationInfo = new ApplicationInfo();

        applicationInfo.flags = 0;

        applicationInfo.uid = Process.FIRST_APPLICATION_UID;

        applicationInfo.backupAgentName = CUSTOM_BACKUP_AGENT_NAME;

        applicationInfo.packageName = TEST_PACKAGE_NAME;

        applicationInfo.enabled = true;



        PackageManagerStub.sApplicationEnabledSetting =

                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;



        boolean isDisabled = AppBackupUtils.appIsDisabled(applicationInfo, mPackageManagerStub);



        assertThat(isDisabled).isFalse();

    }



    @Test

    public void appIsDisabled_stateDefaultManifestDisabled_returnsTrue() throws Exception {

        ApplicationInfo applicationInfo = new ApplicationInfo();

        applicationInfo.flags = 0;

        applicationInfo.uid = Process.FIRST_APPLICATION_UID;

        applicationInfo.backupAgentName = CUSTOM_BACKUP_AGENT_NAME;

        applicationInfo.packageName = TEST_PACKAGE_NAME;

        applicationInfo.enabled = false;



        PackageManagerStub.sApplicationEnabledSetting =

                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;



        boolean isDisabled = AppBackupUtils.appIsDisabled(applicationInfo, mPackageManagerStub);



        assertThat(isDisabled).isTrue();

    }



    @Test

    public void appIsDisabled_stateEnabled_returnsFalse() throws Exception {

        ApplicationInfo applicationInfo = new ApplicationInfo();