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

Commit 6737a44f authored by Chaohui Wang's avatar Chaohui Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5f am: caabb4fe 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945



Change-Id: I97d75ae94ed28e05698b516ef7e43d6c638c2b7a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7af580d0 caabb4fe

src/com/android/settings/applications/appinfo/HibernationSwitchPreferenceController.java

+1 −27
Original line number Diff line number Diff line
@@ -33,13 +33,9 @@ import android.content.Context; 
import android.content.pm.PackageManager;

import android.permission.PermissionControllerManager;

import android.provider.DeviceConfig;

import android.text.TextUtils;

import android.util.Slog;



import androidx.annotation.NonNull;

import androidx.lifecycle.Lifecycle;

import androidx.lifecycle.LifecycleObserver;

import androidx.lifecycle.OnLifecycleEvent;

import androidx.preference.Preference;

import androidx.preference.SwitchPreference;
@@ -49,8 +45,7 @@ import com.google.common.annotations.VisibleForTesting; 
 * A PreferenceController handling the logic for exempting hibernation of app

 */

public final class HibernationSwitchPreferenceController extends AppInfoPreferenceControllerBase

        implements LifecycleObserver, AppOpsManager.OnOpChangedListener,

        Preference.OnPreferenceChangeListener {

        implements Preference.OnPreferenceChangeListener {

    private static final String TAG = "HibernationSwitchPrefController";

    private String mPackageName;

    private final AppOpsManager mAppOpsManager;
@@ -69,19 +64,6 @@ public final class HibernationSwitchPreferenceController extends AppInfoPreferen 
        mPermissionControllerManager = context.getSystemService(PermissionControllerManager.class);

    }



    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)

    public void onResume() {

        if (mIsPackageSet) {

            mAppOpsManager.startWatchingMode(

                    OPSTR_AUTO_REVOKE_PERMISSIONS_IF_UNUSED, mPackageName, this);

        }

    }



    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)

    public void onPause() {

        mAppOpsManager.stopWatchingMode(this);

    }



    @Override

    public int getAvailabilityStatus() {

        return isHibernationEnabled() && mIsPackageSet ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
@@ -148,14 +130,6 @@ public final class HibernationSwitchPreferenceController extends AppInfoPreferen 
        return mode == MODE_DEFAULT ? mIsPackageExemptByDefault : mode != MODE_ALLOWED;

    }



    @Override

    public void onOpChanged(String op, String packageName) {

        if (OPSTR_AUTO_REVOKE_PERMISSIONS_IF_UNUSED.equals(op)

                && TextUtils.equals(mPackageName, packageName)) {

            updateState(mPreference);

        }

    }



    @Override

    public boolean onPreferenceChange(Preference preference, Object isChecked) {

        try {