commit a123021e1d7420b9aafbd74a8549c6bac85fe994
author Joseph Vincent <josephpv@google.com> Tue Dec 19 18:14:53 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 19 18:14:53 2023 +0000
tree 7c59e5b1bae6c43609f58d7c10f96c5cbe6502f4
parent d564f0b6de4043f8f7aaa5592873f2657b57b4fe
parent 4c055dd097d423c0010517506b00e07b01c17d8a

Merge "Finish PS sub-settings page if PS is locked" into main

src/com/android/settings/privatespace/HidePrivateSpaceSettings.java

diff --git a/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java b/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
index 8c73364..09a1855 100644
--- a/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
+++ b/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
@@ -33,6 +33,14 @@
     }
 
     @Override
+    public void onStart() {
+        super.onStart();
+        if (PrivateSpaceMaintainer.getInstance(getContext()).isPrivateSpaceLocked()) {
+            finish();
+        }
+    }
+
+    @Override
     public int getMetricsCategory() {
         return SettingsEnums.PRIVATE_SPACE_SETTINGS;
     }

src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java

diff --git a/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java b/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java
index 459116a..181a8d0 100644
--- a/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java
+++ b/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java
@@ -25,6 +25,7 @@
 
 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;
@@ -43,6 +44,14 @@
     }
 
     @Override
+    public void onStart() {
+        super.onStart();
+        if (PrivateSpaceMaintainer.getInstance(getContext()).isPrivateSpaceLocked()) {
+            finish();
+        }
+    }
+
+    @Override
     public int getMetricsCategory() {
         return SettingsEnums.PRIVATE_SPACE_SETTINGS;
     }