diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index e276484a1aa..57d7d105188 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -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(); diff --git a/src/com/android/settings/privacy/PrivacyDashboardFragment.java b/src/com/android/settings/privacy/PrivacyDashboardFragment.java index 0638c60c94c..df59bd5f119 100644 --- a/src/com/android/settings/privacy/PrivacyDashboardFragment.java +++ b/src/com/android/settings/privacy/PrivacyDashboardFragment.java @@ -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); } }; } diff --git a/src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceController.java b/src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceController.java index 87daf7fe7ba..b5532394aa2 100644 --- a/src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceController.java +++ b/src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceController.java @@ -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; diff --git a/src/com/android/settings/safetycenter/BiometricsSafetySource.java b/src/com/android/settings/safetycenter/BiometricsSafetySource.java index f37ea0361ae..296ca73daa8 100644 --- a/src/com/android/settings/safetycenter/BiometricsSafetySource.java +++ b/src/com/android/settings/safetycenter/BiometricsSafetySource.java @@ -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; } diff --git a/src/com/android/settings/safetycenter/LockScreenSafetySource.java b/src/com/android/settings/safetycenter/LockScreenSafetySource.java index c9c1cd49a43..5ebe12aca95 100644 --- a/src/com/android/settings/safetycenter/LockScreenSafetySource.java +++ b/src/com/android/settings/safetycenter/LockScreenSafetySource.java @@ -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; } diff --git a/src/com/android/settings/safetycenter/SafetyCenterManagerWrapper.java b/src/com/android/settings/safetycenter/SafetyCenterManagerWrapper.java index 7e47f239f93..e4a1d673c4d 100644 --- a/src/com/android/settings/safetycenter/SafetyCenterManagerWrapper.java +++ b/src/com/android/settings/safetycenter/SafetyCenterManagerWrapper.java @@ -58,4 +58,24 @@ public class SafetyCenterManagerWrapper { return; } } + + /** Returns true is SafetyCenter page is enabled, false otherwise. */ + public boolean isEnabled(Context context) { + if (context == null) { + Log.e(TAG, "Context is null at SafetyCenterManagerWrapper#isEnabled"); + return false; + } + SafetyCenterManager safetyCenterManager = + context.getSystemService(SafetyCenterManager.class); + if (safetyCenterManager == null) { + Log.w(TAG, "System service SAFETY_CENTER_SERVICE (SafetyCenterManager) is null"); + return false; + } + try { + return safetyCenterManager.isSafetyCenterEnabled(); + } catch (RuntimeException e) { + Log.e(TAG, "Calling isSafetyCenterEnabled failed.", e); + return false; + } + } } diff --git a/src/com/android/settings/safetycenter/SafetyCenterStatusHolder.java b/src/com/android/settings/safetycenter/SafetyCenterStatusHolder.java deleted file mode 100644 index 014c600d487..00000000000 --- a/src/com/android/settings/safetycenter/SafetyCenterStatusHolder.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.safetycenter; - -import android.content.Context; -import android.safetycenter.SafetyCenterManager; -import android.util.Log; - -import com.android.internal.annotations.VisibleForTesting; - -/** Knows whether safety center is enabled or disabled. */ -public class SafetyCenterStatusHolder { - - private static final String TAG = "SafetyCenterStatusHolder"; - - @VisibleForTesting - public static SafetyCenterStatusHolder sInstance; - - private SafetyCenterStatusHolder() {} - - /** Returns an instance of {@link SafetyCenterStatusHolder}. */ - public static SafetyCenterStatusHolder get() { - if (sInstance == null) { - sInstance = new SafetyCenterStatusHolder(); - } - return sInstance; - } - - /** Returns true is SafetyCenter page is enabled, false otherwise. */ - public boolean isEnabled(Context context) { - if (context == null) { - Log.e(TAG, "Context is null at SafetyCenterStatusHolder#isEnabled"); - return false; - } - SafetyCenterManager safetyCenterManager = - context.getSystemService(SafetyCenterManager.class); - if (safetyCenterManager == null) { - Log.w(TAG, "System service SAFETY_CENTER_SERVICE (SafetyCenterManager) is null"); - return false; - } - try { - return safetyCenterManager.isSafetyCenterEnabled(); - } catch (RuntimeException e) { - Log.e(TAG, "Calling isSafetyCenterEnabled failed.", e); - return false; - } - } -} diff --git a/src/com/android/settings/safetycenter/SafetySourceBroadcastReceiver.java b/src/com/android/settings/safetycenter/SafetySourceBroadcastReceiver.java index 558a8b9f519..a0d18c7d09f 100644 --- a/src/com/android/settings/safetycenter/SafetySourceBroadcastReceiver.java +++ b/src/com/android/settings/safetycenter/SafetySourceBroadcastReceiver.java @@ -36,7 +36,7 @@ public class SafetySourceBroadcastReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - if (!SafetyCenterStatusHolder.get().isEnabled(context)) { + if (!SafetyCenterManagerWrapper.get().isEnabled(context)) { return; } diff --git a/src/com/android/settings/safetycenter/TopLevelSafetyCenterEntryPreferenceController.java b/src/com/android/settings/safetycenter/TopLevelSafetyCenterEntryPreferenceController.java index b00c084e6cb..af9509bf7cc 100644 --- a/src/com/android/settings/safetycenter/TopLevelSafetyCenterEntryPreferenceController.java +++ b/src/com/android/settings/safetycenter/TopLevelSafetyCenterEntryPreferenceController.java @@ -37,7 +37,7 @@ public class TopLevelSafetyCenterEntryPreferenceController extends BasePreferenc @Override public int getAvailabilityStatus() { - if (SafetyCenterStatusHolder.get().isEnabled(mContext)) { + if (SafetyCenterManagerWrapper.get().isEnabled(mContext)) { return AVAILABLE; } return CONDITIONALLY_UNAVAILABLE; diff --git a/src/com/android/settings/security/SecurityAdvancedSettings.java b/src/com/android/settings/security/SecurityAdvancedSettings.java index e5f494507a0..f716064a6ae 100644 --- a/src/com/android/settings/security/SecurityAdvancedSettings.java +++ b/src/com/android/settings/security/SecurityAdvancedSettings.java @@ -34,7 +34,7 @@ import com.android.settings.biometrics.face.FaceProfileStatusPreferenceControlle import com.android.settings.biometrics.fingerprint.FingerprintProfileStatusPreferenceController; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.overlay.FeatureFactory; -import com.android.settings.safetycenter.SafetyCenterStatusHolder; +import com.android.settings.safetycenter.SafetyCenterManagerWrapper; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.security.trustagent.TrustAgentListPreferenceController; import com.android.settings.widget.PreferenceCategoryController; @@ -92,7 +92,7 @@ public class SecurityAdvancedSettings extends DashboardFragment { final Context context = getContext(); if (context == null) { return CATEGORY_SECURITY_LEGACY_ADVANCED_SETTINGS; - } else if (SafetyCenterStatusHolder.get().isEnabled(context)) { + } else if (SafetyCenterManagerWrapper.get().isEnabled(context)) { return CategoryKey.CATEGORY_SECURITY_ADVANCED_SETTINGS; } else { final SecuritySettingsFeatureProvider securitySettingsFeatureProvider = diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java index 6bfbf6cc3f3..6aadee6aad5 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -25,7 +25,7 @@ import com.android.settings.biometrics.face.FaceStatusPreferenceController; import com.android.settings.biometrics.fingerprint.FingerprintStatusPreferenceController; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.overlay.FeatureFactory; -import com.android.settings.safetycenter.SafetyCenterStatusHolder; +import com.android.settings.safetycenter.SafetyCenterManagerWrapper; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.security.trustagent.TrustAgentListPreferenceController; import com.android.settings.widget.PreferenceCategoryController; @@ -129,7 +129,7 @@ public class SecuritySettings extends DashboardFragment { protected boolean isPageSearchEnabled(Context context) { return !FeatureFactory.getFactory(context).getSecuritySettingsFeatureProvider() .hasAlternativeSecuritySettingsFragment() - && !SafetyCenterStatusHolder.get().isEnabled(context); + && !SafetyCenterManagerWrapper.get().isEnabled(context); } }; } diff --git a/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java b/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java index 11d1dc32da7..3cf40a0e907 100644 --- a/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java +++ b/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java @@ -24,7 +24,7 @@ import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.SubSettingLauncher; import com.android.settings.overlay.FeatureFactory; -import com.android.settings.safetycenter.SafetyCenterStatusHolder; +import com.android.settings.safetycenter.SafetyCenterManagerWrapper; public class TopLevelSecurityEntryPreferenceController extends BasePreferenceController { @@ -38,7 +38,7 @@ public class TopLevelSecurityEntryPreferenceController extends BasePreferenceCon @Override public int getAvailabilityStatus() { - if (!SafetyCenterStatusHolder.get().isEnabled(mContext)) { + if (!SafetyCenterManagerWrapper.get().isEnabled(mContext)) { return AVAILABLE; } return CONDITIONALLY_UNAVAILABLE; diff --git a/tests/unit/src/com/android/settings/privacy/PrivacyDashboardActivityTest.java b/tests/unit/src/com/android/settings/privacy/PrivacyDashboardActivityTest.java index d4df97ff77e..1cfee0f377a 100644 --- a/tests/unit/src/com/android/settings/privacy/PrivacyDashboardActivityTest.java +++ b/tests/unit/src/com/android/settings/privacy/PrivacyDashboardActivityTest.java @@ -33,7 +33,7 @@ import androidx.test.platform.app.InstrumentationRegistry; import com.android.settings.Settings; import com.android.settings.SettingsActivity; -import com.android.settings.safetycenter.SafetyCenterStatusHolder; +import com.android.settings.safetycenter.SafetyCenterManagerWrapper; import org.junit.Before; import org.junit.Test; @@ -48,14 +48,14 @@ public class PrivacyDashboardActivityTest { private static final String DEFAULT_FRAGMENT_CLASSNAME = "DefaultFragmentClassname"; @Mock - private SafetyCenterStatusHolder mSafetyCenterStatusHolder; + private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper; private Settings.PrivacyDashboardActivity mActivity; @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder; + SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper; final Intent intent = new Intent(); intent.setAction(android.provider.Settings.ACTION_PRIVACY_SETTINGS); intent.setClass(InstrumentationRegistry.getInstrumentation().getTargetContext(), @@ -78,7 +78,7 @@ public class PrivacyDashboardActivityTest { @Test public void onCreate_whenSafetyCenterEnabled_redirectsToSafetyCenter() { - when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(true); + when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(true); final ArgumentCaptor intentCaptor = ArgumentCaptor.forClass(Intent.class); mActivity.handleSafetyCenterRedirection(); @@ -89,7 +89,7 @@ public class PrivacyDashboardActivityTest { @Test public void onCreate_whenSafetyCenterDisabled_doesntRedirectToSafetyCenter() { - when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(false); + when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(false); mActivity.handleSafetyCenterRedirection(); verify(mActivity, times(0)).startActivity(any()); diff --git a/tests/unit/src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceControllerTest.java b/tests/unit/src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceControllerTest.java index 495700a10dd..bc6be2eaf80 100644 --- a/tests/unit/src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceControllerTest.java @@ -26,7 +26,7 @@ import android.content.Context; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; -import com.android.settings.safetycenter.SafetyCenterStatusHolder; +import com.android.settings.safetycenter.SafetyCenterManagerWrapper; import com.android.settings.security.TopLevelSecurityEntryPreferenceController; import org.junit.Before; @@ -43,12 +43,12 @@ public class TopLevelPrivacyEntryPreferenceControllerTest { private TopLevelPrivacyEntryPreferenceController mTopLevelPrivacyEntryPreferenceController; @Mock - private SafetyCenterStatusHolder mSafetyCenterStatusHolder; + private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper; @Before public void setUp() { MockitoAnnotations.initMocks(this); - SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder; + SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper; mTopLevelPrivacyEntryPreferenceController = new TopLevelPrivacyEntryPreferenceController( @@ -57,7 +57,7 @@ public class TopLevelPrivacyEntryPreferenceControllerTest { @Test public void getAvailabilityStatus_whenSafetyCenterEnabled_returnsUnavailable() { - when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(true); + when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(true); assertThat(mTopLevelPrivacyEntryPreferenceController.getAvailabilityStatus()) .isEqualTo(TopLevelSecurityEntryPreferenceController.CONDITIONALLY_UNAVAILABLE); @@ -65,7 +65,7 @@ public class TopLevelPrivacyEntryPreferenceControllerTest { @Test public void getAvailabilityStatus_whenSafetyCenterDisabled_returnsAvailable() { - when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(false); + when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(false); assertThat(mTopLevelPrivacyEntryPreferenceController.getAvailabilityStatus()) .isEqualTo(TopLevelSecurityEntryPreferenceController.AVAILABLE); diff --git a/tests/unit/src/com/android/settings/safetycenter/BiometricsSafetySourceTest.java b/tests/unit/src/com/android/settings/safetycenter/BiometricsSafetySourceTest.java index f53d3366474..2627d245d96 100644 --- a/tests/unit/src/com/android/settings/safetycenter/BiometricsSafetySourceTest.java +++ b/tests/unit/src/com/android/settings/safetycenter/BiometricsSafetySourceTest.java @@ -41,26 +41,21 @@ public class BiometricsSafetySourceTest { @Mock private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper; - @Mock - private SafetyCenterStatusHolder mSafetyCenterStatusHolder; - @Before public void setUp() { MockitoAnnotations.initMocks(this); mApplicationContext = ApplicationProvider.getApplicationContext(); SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper; - SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder; } @After public void tearDown() { SafetyCenterManagerWrapper.sInstance = null; - SafetyCenterStatusHolder.sInstance = null; } @Test public void sendSafetyData_whenSafetyCenterIsDisabled_sendsNoData() { - when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(false); + when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(false); BiometricsSafetySource.sendSafetyData(mApplicationContext); @@ -70,7 +65,7 @@ public class BiometricsSafetySourceTest { @Test // TODO(b/215517420): Adapt this test when method is implemented. public void sendSafetyData_whenSafetyCenterIsEnabled_sendsNoData() { - when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true); + when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true); BiometricsSafetySource.sendSafetyData(mApplicationContext); diff --git a/tests/unit/src/com/android/settings/safetycenter/LockScreenSafetySourceTest.java b/tests/unit/src/com/android/settings/safetycenter/LockScreenSafetySourceTest.java index 4a58b4c2f04..4b214083e5b 100644 --- a/tests/unit/src/com/android/settings/safetycenter/LockScreenSafetySourceTest.java +++ b/tests/unit/src/com/android/settings/safetycenter/LockScreenSafetySourceTest.java @@ -56,9 +56,6 @@ public class LockScreenSafetySourceTest { @Mock private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper; - @Mock - private SafetyCenterStatusHolder mSafetyCenterStatusHolder; - @Mock private ScreenLockPreferenceDetailsUtils mScreenLockPreferenceDetailsUtils; @@ -67,18 +64,16 @@ public class LockScreenSafetySourceTest { MockitoAnnotations.initMocks(this); mApplicationContext = ApplicationProvider.getApplicationContext(); SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper; - SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder; } @After public void tearDown() { SafetyCenterManagerWrapper.sInstance = null; - SafetyCenterStatusHolder.sInstance = null; } @Test public void sendSafetyData_whenSafetyCenterIsDisabled_sendsNoData() { - when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(false); + when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(false); LockScreenSafetySource.sendSafetyData(mApplicationContext, mScreenLockPreferenceDetailsUtils); @@ -88,7 +83,7 @@ public class LockScreenSafetySourceTest { @Test public void sendSafetyData_whenScreenLockIsDisabled_sendsNoData() { - when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true); + when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true); when(mScreenLockPreferenceDetailsUtils.isAvailable()).thenReturn(false); LockScreenSafetySource.sendSafetyData(mApplicationContext, @@ -227,7 +222,7 @@ public class LockScreenSafetySourceTest { } private void whenScreenLockIsEnabled() { - when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true); + when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true); when(mScreenLockPreferenceDetailsUtils.isAvailable()).thenReturn(true); when(mScreenLockPreferenceDetailsUtils.getSummary(anyInt())).thenReturn(SUMMARY); diff --git a/tests/unit/src/com/android/settings/safetycenter/SafetyCenterStatusHolderTest.java b/tests/unit/src/com/android/settings/safetycenter/SafetyCenterManagerWrapperTest.java similarity index 87% rename from tests/unit/src/com/android/settings/safetycenter/SafetyCenterStatusHolderTest.java rename to tests/unit/src/com/android/settings/safetycenter/SafetyCenterManagerWrapperTest.java index 2a31eb8e14a..432a5d67e98 100644 --- a/tests/unit/src/com/android/settings/safetycenter/SafetyCenterStatusHolderTest.java +++ b/tests/unit/src/com/android/settings/safetycenter/SafetyCenterManagerWrapperTest.java @@ -32,7 +32,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) -public class SafetyCenterStatusHolderTest { +public class SafetyCenterManagerWrapperTest { @Mock private Context mContext; @@ -44,13 +44,13 @@ public class SafetyCenterStatusHolderTest { @Test public void isEnabled_whenContextNull_returnsFalse() { - assertThat(SafetyCenterStatusHolder.get().isEnabled(null)).isFalse(); + assertThat(SafetyCenterManagerWrapper.get().isEnabled(null)).isFalse(); } @Test public void isEnabled_whenSystemServiceNull_returnsFalse() { when(mContext.getSystemService(SafetyCenterManager.class)).thenReturn(null); - assertThat(SafetyCenterStatusHolder.get().isEnabled(mContext)).isFalse(); + assertThat(SafetyCenterManagerWrapper.get().isEnabled(mContext)).isFalse(); } } diff --git a/tests/unit/src/com/android/settings/safetycenter/SafetySourceBroadcastReceiverTest.java b/tests/unit/src/com/android/settings/safetycenter/SafetySourceBroadcastReceiverTest.java index 6c9addd6a3e..d81e8afed3a 100644 --- a/tests/unit/src/com/android/settings/safetycenter/SafetySourceBroadcastReceiverTest.java +++ b/tests/unit/src/com/android/settings/safetycenter/SafetySourceBroadcastReceiverTest.java @@ -50,26 +50,21 @@ public class SafetySourceBroadcastReceiverTest { @Mock private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper; - @Mock - private SafetyCenterStatusHolder mSafetyCenterStatusHolder; - @Before public void setUp() { MockitoAnnotations.initMocks(this); mApplicationContext = ApplicationProvider.getApplicationContext(); SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper; - SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder; } @After public void tearDown() { SafetyCenterManagerWrapper.sInstance = null; - SafetyCenterStatusHolder.sInstance = null; } @Test public void sendSafetyData_whenSafetyCenterIsEnabled_withNoIntentAction_sendsNoData() { - when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true); + when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true); Intent intent = new Intent().putExtra(EXTRA_REFRESH_SAFETY_SOURCE_IDS, new String[]{}); new SafetySourceBroadcastReceiver().onReceive(mApplicationContext, intent); @@ -79,7 +74,7 @@ public class SafetySourceBroadcastReceiverTest { @Test public void sendSafetyData_whenSafetyCenterIsDisabled_sendsNoData() { - when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(false); + when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(false); Intent intent = new Intent() .setAction(ACTION_REFRESH_SAFETY_SOURCES) @@ -94,7 +89,7 @@ public class SafetySourceBroadcastReceiverTest { @Test public void sendSafetyData_whenSafetyCenterIsEnabled_withNullSourceIds_sendsNoData() { - when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true); + when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true); Intent intent = new Intent().setAction(ACTION_REFRESH_SAFETY_SOURCES); new SafetySourceBroadcastReceiver().onReceive(mApplicationContext, intent); @@ -104,7 +99,7 @@ public class SafetySourceBroadcastReceiverTest { @Test public void sendSafetyData_whenSafetyCenterIsEnabled_withNoSourceIds_sendsNoData() { - when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true); + when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true); Intent intent = new Intent() .setAction(ACTION_REFRESH_SAFETY_SOURCES) @@ -117,7 +112,7 @@ public class SafetySourceBroadcastReceiverTest { @Test public void sendSafetyData_withLockscreenSourceId_sendsLockscreenData() { - when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true); + when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true); Intent intent = new Intent() .setAction(ACTION_REFRESH_SAFETY_SOURCES) @@ -136,7 +131,7 @@ public class SafetySourceBroadcastReceiverTest { @Test public void sendSafetyData_withBiometricsSourceId_sendsBiometricData() { - when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true); + when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true); Intent intent = new Intent() .setAction(ACTION_REFRESH_SAFETY_SOURCES) @@ -152,7 +147,7 @@ public class SafetySourceBroadcastReceiverTest { @Test public void sendSafetyData_onBootCompleted_sendsBiometricAndLockscreenData() { - when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true); + when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true); Intent intent = new Intent().setAction(Intent.ACTION_BOOT_COMPLETED); // TODO(b/215517420): Update this test when BiometricSafetySource is implemented to test diff --git a/tests/unit/src/com/android/settings/safetycenter/TopLevelSafetyCenterEntryPreferenceControllerTest.java b/tests/unit/src/com/android/settings/safetycenter/TopLevelSafetyCenterEntryPreferenceControllerTest.java index e9c451e4c31..25cd774ea05 100644 --- a/tests/unit/src/com/android/settings/safetycenter/TopLevelSafetyCenterEntryPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/safetycenter/TopLevelSafetyCenterEntryPreferenceControllerTest.java @@ -32,6 +32,7 @@ import androidx.preference.Preference; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -49,7 +50,7 @@ public class TopLevelSafetyCenterEntryPreferenceControllerTest { private Preference mPreference; @Mock - private SafetyCenterStatusHolder mSafetyCenterStatusHolder; + private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper; @Mock private Context mContext; @@ -57,7 +58,7 @@ public class TopLevelSafetyCenterEntryPreferenceControllerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder; + SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper; mPreference = new Preference(ApplicationProvider.getApplicationContext()); mPreference.setKey(PREFERENCE_KEY); @@ -67,6 +68,11 @@ public class TopLevelSafetyCenterEntryPreferenceControllerTest { new TopLevelSafetyCenterEntryPreferenceController(mContext, PREFERENCE_KEY); } + @After + public void tearDown() { + SafetyCenterManagerWrapper.sInstance = null; + } + @Test public void handlePreferenceTreeClick_forDifferentPreferenceKey_isNotHandled() { Preference preference = new Preference(ApplicationProvider.getApplicationContext()); @@ -104,7 +110,7 @@ public class TopLevelSafetyCenterEntryPreferenceControllerTest { @Test public void getAvailabilityStatus_whenSafetyCenterDisabled_returnsUnavailable() { - when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(false); + when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(false); assertThat(mTopLevelSafetyCenterEntryPreferenceController.getAvailabilityStatus()) .isEqualTo(TopLevelSafetyCenterEntryPreferenceController.CONDITIONALLY_UNAVAILABLE); @@ -112,7 +118,7 @@ public class TopLevelSafetyCenterEntryPreferenceControllerTest { @Test public void getAvailabilityStatus_whenSafetyCenterEnabled_returnsAvailable() { - when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(true); + when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(true); assertThat(mTopLevelSafetyCenterEntryPreferenceController.getAvailabilityStatus()) .isEqualTo(TopLevelSafetyCenterEntryPreferenceController.AVAILABLE); diff --git a/tests/unit/src/com/android/settings/security/SecurityAdvancedSettingsTest.java b/tests/unit/src/com/android/settings/security/SecurityAdvancedSettingsTest.java index ac91abba547..2efb357b869 100644 --- a/tests/unit/src/com/android/settings/security/SecurityAdvancedSettingsTest.java +++ b/tests/unit/src/com/android/settings/security/SecurityAdvancedSettingsTest.java @@ -29,7 +29,7 @@ import androidx.test.annotation.UiThreadTest; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; -import com.android.settings.safetycenter.SafetyCenterStatusHolder; +import com.android.settings.safetycenter.SafetyCenterManagerWrapper; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.ResourcesUtils; import com.android.settingslib.drawer.CategoryKey; @@ -51,7 +51,7 @@ public class SecurityAdvancedSettingsTest { private SecurityAdvancedSettings mSecurityAdvancedSettings; @Mock - private SafetyCenterStatusHolder mSafetyCenterStatusHolder; + private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper; @Before @UiThreadTest @@ -61,7 +61,7 @@ public class SecurityAdvancedSettingsTest { Looper.prepare(); } - SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder; + SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper; mContext = ApplicationProvider.getApplicationContext(); mSecurityAdvancedSettings = spy(new SecurityAdvancedSettings()); @@ -76,7 +76,7 @@ public class SecurityAdvancedSettingsTest { @Test public void getCategoryKey_whenSafetyCenterIsEnabled_returnsSecurity() { - when(mSafetyCenterStatusHolder.isEnabled(any())).thenReturn(true); + when(mSafetyCenterManagerWrapper.isEnabled(any())).thenReturn(true); assertThat(mSecurityAdvancedSettings.getCategoryKey()) .isEqualTo(CategoryKey.CATEGORY_SECURITY_ADVANCED_SETTINGS); @@ -84,7 +84,7 @@ public class SecurityAdvancedSettingsTest { @Test public void getCategoryKey_whenAlternativeFragmentPresented_returnsAlternative() { - when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(false); + when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(false); setupAlternativeFragment(true, ALTERNATIVE_CATEGORY_KEY); assertThat(mSecurityAdvancedSettings.getCategoryKey()) @@ -93,7 +93,7 @@ public class SecurityAdvancedSettingsTest { @Test public void getCategoryKey_whenNoAlternativeFragmentPresented_returnsLegacy() { - when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(false); + when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(false); setupAlternativeFragment(false, null); assertThat(mSecurityAdvancedSettings.getCategoryKey()) diff --git a/tests/unit/src/com/android/settings/security/SecurityDashboardActivityTest.java b/tests/unit/src/com/android/settings/security/SecurityDashboardActivityTest.java index 33486638bd9..82112c96807 100644 --- a/tests/unit/src/com/android/settings/security/SecurityDashboardActivityTest.java +++ b/tests/unit/src/com/android/settings/security/SecurityDashboardActivityTest.java @@ -33,7 +33,7 @@ import androidx.test.platform.app.InstrumentationRegistry; import com.android.settings.Settings; import com.android.settings.SettingsActivity; -import com.android.settings.safetycenter.SafetyCenterStatusHolder; +import com.android.settings.safetycenter.SafetyCenterManagerWrapper; import com.android.settings.testutils.FakeFeatureFactory; import org.junit.Before; @@ -53,14 +53,14 @@ public class SecurityDashboardActivityTest { private Intent mDefaultIntent; @Mock - private SafetyCenterStatusHolder mSafetyCenterStatusHolder; + private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper; @Before public void setUp() { MockitoAnnotations.initMocks(this); FakeFeatureFactory mFeatureFactory = FakeFeatureFactory.setupForTest(); mSecuritySettingsFeatureProvider = mFeatureFactory.getSecuritySettingsFeatureProvider(); - SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder; + SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper; mDefaultIntent = new Intent(); mDefaultIntent.setAction(android.provider.Settings.ACTION_SECURITY_SETTINGS); @@ -122,7 +122,7 @@ public class SecurityDashboardActivityTest { @Test public void onCreate_whenSafetyCenterEnabled_redirectsToSafetyCenter() { - when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(true); + when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(true); final ArgumentCaptor intentCaptor = ArgumentCaptor.forClass(Intent.class); mActivity.handleSafetyCenterRedirection(); @@ -133,7 +133,7 @@ public class SecurityDashboardActivityTest { @Test public void onCreate_whenSafetyCenterDisabled_doesntRedirectToSafetyCenter() { - when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(false); + when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(false); mActivity.handleSafetyCenterRedirection(); diff --git a/tests/unit/src/com/android/settings/security/TopLevelSecurityEntryPreferenceControllerTest.java b/tests/unit/src/com/android/settings/security/TopLevelSecurityEntryPreferenceControllerTest.java index 81ebda6f4ac..eb8fa17807b 100644 --- a/tests/unit/src/com/android/settings/security/TopLevelSecurityEntryPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/security/TopLevelSecurityEntryPreferenceControllerTest.java @@ -31,7 +31,7 @@ import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.android.settings.SettingsActivity; -import com.android.settings.safetycenter.SafetyCenterStatusHolder; +import com.android.settings.safetycenter.SafetyCenterManagerWrapper; import com.android.settings.testutils.FakeFeatureFactory; import org.junit.Before; @@ -55,14 +55,14 @@ public class TopLevelSecurityEntryPreferenceControllerTest { @Mock private Context mContext; @Mock - private SafetyCenterStatusHolder mSafetyCenterStatusHolder; + private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper; @Before public void setUp() { MockitoAnnotations.initMocks(this); mFeatureFactory = FakeFeatureFactory.setupForTest(); mSecuritySettingsFeatureProvider = mFeatureFactory.getSecuritySettingsFeatureProvider(); - SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder; + SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper; mPreference = new Preference(ApplicationProvider.getApplicationContext()); mPreference.setKey(PREFERENCE_KEY); @@ -128,7 +128,7 @@ public class TopLevelSecurityEntryPreferenceControllerTest { @Test public void getAvailabilityStatus_whenSafetyCenterEnabled_returnsUnavailable() { - when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(true); + when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(true); assertThat(mTopLevelSecurityEntryPreferenceController.getAvailabilityStatus()) .isEqualTo(TopLevelSecurityEntryPreferenceController.CONDITIONALLY_UNAVAILABLE); @@ -136,7 +136,7 @@ public class TopLevelSecurityEntryPreferenceControllerTest { @Test public void getAvailabilityStatus_whenSafetyCenterDisabled_returnsAvailable() { - when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(false); + when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(false); assertThat(mTopLevelSecurityEntryPreferenceController.getAvailabilityStatus()) .isEqualTo(TopLevelSecurityEntryPreferenceController.AVAILABLE);