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

Commit 844d2f4c authored by Song Chun Fan's avatar Song Chun Fan Committed by Cherrypicker Worker
Browse files

[Settings/Archive] remove all checks for the archiving system property 

No longer needed

BUG: 331165939
Test: builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6ae958abd26ed77ecd4d3fb1720bb912553da2ea)
Merged-In: I24bc9a3d7503da1606d29eb3dfa963b0e6bf9d3e
Change-Id: I24bc9a3d7503da1606d29eb3dfa963b0e6bf9d3e
parent f6e0b08f

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

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

    }





    private boolean isArchivingEnabled() {

    private boolean isArchivingEnabled() {

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

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

                || Flags.appArchiving();

    }

    }





    @Override

    @Override

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

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

}





fun isArchivingEnabled(featureFlags: PmFeatureFlags) =

fun isArchivingEnabled(featureFlags: PmFeatureFlags) =

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

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

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

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

}





private fun isArchivingEnabled() =

private fun isArchivingEnabled() =

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

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

                || Flags.appArchiving()





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

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

    private val appOpsManager = context.appOpsManager

    private val appOpsManager = context.appOpsManager

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

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

    }





    private fun isArchivingEnabled() =

    private fun isArchivingEnabled() =

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

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

                    || Flags.appArchiving()

    @Test

    @Test

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

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

        mockOpsMode(MODE_DEFAULT)

        mockOpsMode(MODE_DEFAULT)