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

Commit d4553dd1 authored by Marie Matheson's avatar Marie Matheson Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b220384387" into tm-mainline-prod 

* changes:
  [automerge] Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper 2p: ce321f0d
  Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper
parents e1be038c 4efab754

src/com/android/settings/Settings.java

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import com.android.settings.enterprise.EnterprisePrivacySettings; 
import com.android.settings.network.SubscriptionUtil;

import com.android.settings.network.telephony.MobileNetworkUtils;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.safetycenter.SafetyCenterStatusHolder;

import com.android.settings.safetycenter.SafetyCenterManagerWrapper;

import com.android.settings.security.SecuritySettingsFeatureProvider;



import com.google.android.setupdesign.util.ThemeHelper;
@@ -152,7 +152,7 @@ public class Settings extends SettingsActivity { 
        /** Redirects to SafetyCenter if enabled. */

        @VisibleForTesting

        public void handleSafetyCenterRedirection() {

            if (SafetyCenterStatusHolder.get().isEnabled(this)) {

            if (SafetyCenterManagerWrapper.get().isEnabled(this)) {

                try {

                    startActivity(new Intent(Intent.ACTION_SAFETY_CENTER));

                    finish();
@@ -213,7 +213,7 @@ public class Settings extends SettingsActivity { 
        /** Redirects to SafetyCenter if enabled. */

        @VisibleForTesting

        public void handleSafetyCenterRedirection() {

            if (SafetyCenterStatusHolder.get().isEnabled(this)) {

            if (SafetyCenterManagerWrapper.get().isEnabled(this)) {

                try {

                    startActivity(new Intent(Intent.ACTION_SAFETY_CENTER));

                    finish();

src/com/android/settings/privacy/PrivacyDashboardFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import android.os.Bundle; 
import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.notification.LockScreenNotificationPreferenceController;

import com.android.settings.safetycenter.SafetyCenterStatusHolder;

import com.android.settings.safetycenter.SafetyCenterManagerWrapper;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -118,7 +118,7 @@ public class PrivacyDashboardFragment extends DashboardFragment { 


                @Override

                protected boolean isPageSearchEnabled(Context context) {

                    return !SafetyCenterStatusHolder.get().isEnabled(context);

                    return !SafetyCenterManagerWrapper.get().isEnabled(context);

                }

            };

}

src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.annotation.NonNull; 
import android.content.Context;



import com.android.settings.core.BasePreferenceController;

import com.android.settings.safetycenter.SafetyCenterStatusHolder;

import com.android.settings.safetycenter.SafetyCenterManagerWrapper;



/** The preference controller for the top level privacy tile. */

public class TopLevelPrivacyEntryPreferenceController  extends BasePreferenceController {
@@ -31,7 +31,7 @@ public class TopLevelPrivacyEntryPreferenceController extends BasePreferenceCon 


    @Override

    public int getAvailabilityStatus() {

        if (!SafetyCenterStatusHolder.get().isEnabled(mContext)) {

        if (!SafetyCenterManagerWrapper.get().isEnabled(mContext)) {

            return AVAILABLE;

        }

        return CONDITIONALLY_UNAVAILABLE;

src/com/android/settings/safetycenter/BiometricsSafetySource.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ public final class BiometricsSafetySource { 


    /** Sends biometric safety data to Safety Center. */

    public static void sendSafetyData(Context context) {

        if (!SafetyCenterStatusHolder.get().isEnabled(context)) {

        if (!SafetyCenterManagerWrapper.get().isEnabled(context)) {

            return;

        }

src/com/android/settings/safetycenter/LockScreenSafetySource.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public final class LockScreenSafetySource { 
    /** Sends lock screen safety data to Safety Center. */

    public static void sendSafetyData(Context context,

            ScreenLockPreferenceDetailsUtils screenLockPreferenceDetailsUtils) {

        if (!SafetyCenterStatusHolder.get().isEnabled(context)) {

        if (!SafetyCenterManagerWrapper.get().isEnabled(context)) {

            return;

        }