diff --git a/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java b/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java index 8c733646daa..09a1855134a 100644 --- a/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java +++ b/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java @@ -32,6 +32,14 @@ public class HidePrivateSpaceSettings extends DashboardFragment{ } } + @Override + public void onStart() { + super.onStart(); + if (PrivateSpaceMaintainer.getInstance(getContext()).isPrivateSpaceLocked()) { + finish(); + } + } + @Override public int getMetricsCategory() { return SettingsEnums.PRIVATE_SPACE_SETTINGS; diff --git a/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java b/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java index 459116ace02..181a8d0ea44 100644 --- a/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java +++ b/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java @@ -25,6 +25,7 @@ import androidx.annotation.Nullable; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; +import com.android.settings.privatespace.PrivateSpaceMaintainer; import com.android.settingslib.core.AbstractPreferenceController; import java.util.ArrayList; @@ -42,6 +43,14 @@ public class UseOneLockSettingsFragment extends DashboardFragment { } } + @Override + public void onStart() { + super.onStart(); + if (PrivateSpaceMaintainer.getInstance(getContext()).isPrivateSpaceLocked()) { + finish(); + } + } + @Override public int getMetricsCategory() { return SettingsEnums.PRIVATE_SPACE_SETTINGS;