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

Commit 523fd97c authored by Song Chun Fan's avatar Song Chun Fan Committed by Android (Google) Code Review
Browse files

Merge "[Settings/Archive] remove all checks for the archiving system property" into main

parents fba70ede 6ae958ab

src/com/android/settings/applications/AppCounter.java

+1 −2
Original line number Diff line number Diff line
@@ -72,8 +72,7 @@ public abstract class AppCounter extends AsyncTask<Void, Void, Integer> { 
    }



    private boolean isArchivingEnabled() {

        return mFf.archiving() || SystemProperties.getBoolean("pm.archiving.enabled", false)

                || Flags.appArchiving();

        return mFf.archiving() || Flags.appArchiving();

    }



    @Override

src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt

+1 −2
Original line number Diff line number Diff line
@@ -179,5 +179,4 @@ private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) { 
}



fun isArchivingEnabled(featureFlags: PmFeatureFlags) =

        featureFlags.archiving() || SystemProperties.getBoolean("pm.archiving.enabled", false)

                || Flags.appArchiving()
 
 No newline at end of file
 
        featureFlags.archiving() || Flags.appArchiving()
 
 No newline at end of file

src/com/android/settings/spa/app/appinfo/HibernationSwitchPreference.kt

+1 −2
Original line number Diff line number Diff line
@@ -93,8 +93,7 @@ fun HibernationSwitchPreference( 
}



private fun isArchivingEnabled() =

        PmFlags.archiving() || SystemProperties.getBoolean("pm.archiving.enabled", false)

                || Flags.appArchiving()

        PmFlags.archiving() || Flags.appArchiving()



private class HibernationSwitchPresenter(context: Context, private val app: ApplicationInfo) {

    private val appOpsManager = context.appOpsManager

tests/spa_unit/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreferenceTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -163,8 +163,7 @@ class HibernationSwitchPreferenceTest { 
    }



    private fun isArchivingEnabled() =

            PmFlags.archiving() || SystemProperties.getBoolean("pm.archiving.enabled", false)

                    || Flags.appArchiving()

            PmFlags.archiving() || Flags.appArchiving()

    @Test

    fun `An app targets Q with ops mode default when hibernation targets pre S - not exempted`() {

        mockOpsMode(MODE_DEFAULT)