Put stricter flag checks
Also removed a log which gives away flag.
Bug: 312976400
Test: manual
Change-Id: I4a989de8b6b920666aabf0cc9311e28becc4d862
diff --git a/src/com/android/settings/privatespace/AutoAdvanceSetupFragment.java b/src/com/android/settings/privatespace/AutoAdvanceSetupFragment.java
index 1061498..036a13a 100644
--- a/src/com/android/settings/privatespace/AutoAdvanceSetupFragment.java
+++ b/src/com/android/settings/privatespace/AutoAdvanceSetupFragment.java
@@ -93,6 +93,13 @@
};
@Override
+ public void onCreate(@Nullable Bundle savedInstanceState) {
+ if (android.os.Flags.allowPrivateProfile()) {
+ super.onCreate(savedInstanceState);
+ }
+ }
+
+ @Override
public View onCreateView(
LayoutInflater inflater,
@Nullable ViewGroup container,
diff --git a/src/com/android/settings/privatespace/DeletePrivateSpaceController.java b/src/com/android/settings/privatespace/DeletePrivateSpaceController.java
index c94f63a..98bf827 100644
--- a/src/com/android/settings/privatespace/DeletePrivateSpaceController.java
+++ b/src/com/android/settings/privatespace/DeletePrivateSpaceController.java
@@ -53,7 +53,7 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ return android.os.Flags.allowPrivateProfile() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/privatespace/HidePrivateSpaceController.java b/src/com/android/settings/privatespace/HidePrivateSpaceController.java
index 8a0f167..a53055c 100644
--- a/src/com/android/settings/privatespace/HidePrivateSpaceController.java
+++ b/src/com/android/settings/privatespace/HidePrivateSpaceController.java
@@ -38,7 +38,7 @@
@Override
@AvailabilityStatus
public int getAvailabilityStatus() {
- return AVAILABLE;
+ return android.os.Flags.allowPrivateProfile() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java b/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
index d7a9cf5..8c73364 100644
--- a/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
+++ b/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
@@ -17,6 +17,7 @@
package com.android.settings.privatespace;
import android.app.settings.SettingsEnums;
+import android.os.Bundle;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -25,6 +26,13 @@
private static final String TAG = "HidePrivateSpaceSettings";
@Override
+ public void onCreate(Bundle icicle) {
+ if (android.os.Flags.allowPrivateProfile()) {
+ super.onCreate(icicle);
+ }
+ }
+
+ @Override
public int getMetricsCategory() {
return SettingsEnums.PRIVATE_SPACE_SETTINGS;
}
diff --git a/src/com/android/settings/privatespace/HidePrivateSpaceSummaryController.java b/src/com/android/settings/privatespace/HidePrivateSpaceSummaryController.java
index 73b3960..42627af 100644
--- a/src/com/android/settings/privatespace/HidePrivateSpaceSummaryController.java
+++ b/src/com/android/settings/privatespace/HidePrivateSpaceSummaryController.java
@@ -36,7 +36,7 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ return android.os.Flags.allowPrivateProfile() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java b/src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java
index 0539f60..31d4be9 100644
--- a/src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java
+++ b/src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java
@@ -52,6 +52,9 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
+ if (!android.os.Flags.allowPrivateProfile()) {
+ return;
+ }
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
ThemeHelper.trySetDynamicColor(this);
super.onCreate(savedInstanceState);
diff --git a/src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivity.java b/src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivity.java
index 3f212b1..1efd445 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivity.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivity.java
@@ -66,9 +66,8 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
if (Flags.allowPrivateProfile()) {
+ super.onCreate(savedInstanceState);
ThemeHelper.trySetDynamicColor(this);
mPrivateSpaceMaintainer = new Injector().injectPrivateSpaceMaintainer(
getApplicationContext());
@@ -87,7 +86,6 @@
promptToSetDeviceLock();
}
} else {
- Log.w(TAG, "allowPrivateProfile flag is Off!");
finish();
}
}
diff --git a/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java b/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java
index 5d00329..1e27ec1 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java
@@ -17,6 +17,7 @@
package com.android.settings.privatespace;
import android.app.settings.SettingsEnums;
+import android.os.Bundle;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -26,6 +27,13 @@
private static final String TAG = "PrivateSpaceDashboardFragment";
@Override
+ public void onCreate(Bundle icicle) {
+ if (android.os.Flags.allowPrivateProfile()) {
+ super.onCreate(icicle);
+ }
+ }
+
+ @Override
protected int getPreferenceScreenResId() {
return R.xml.private_space_settings;
}
diff --git a/src/com/android/settings/privatespace/PrivateSpaceEducation.java b/src/com/android/settings/privatespace/PrivateSpaceEducation.java
index 5dd0cfa..0c87b2b 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceEducation.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceEducation.java
@@ -39,6 +39,9 @@
LayoutInflater inflater,
@Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
+ if (!android.os.Flags.allowPrivateProfile()) {
+ return null;
+ }
GlifLayout rootView =
(GlifLayout)
inflater.inflate(R.layout.privatespace_education_screen, container, false);
diff --git a/src/com/android/settings/privatespace/PrivateSpaceMaintainer.java b/src/com/android/settings/privatespace/PrivateSpaceMaintainer.java
index 341110b..3ec7c92 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceMaintainer.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceMaintainer.java
@@ -25,6 +25,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.UserInfo;
+import android.os.Flags;
import android.os.RemoteException;
import android.os.UserHandle;
import android.os.UserManager;
@@ -68,6 +69,9 @@
* <p> This method should be used by the Private Space Setup Flow ONLY.
*/
final synchronized boolean createPrivateSpace() {
+ if (!Flags.allowPrivateProfile()) {
+ return false;
+ }
// Check if Private space already exists
if (doesPrivateSpaceExist()) {
return true;
@@ -130,6 +134,9 @@
/** Returns true if the Private space exists. */
public synchronized boolean doesPrivateSpaceExist() {
+ if (!Flags.allowPrivateProfile()) {
+ return false;
+ }
if (mUserHandle != null) {
return true;
}
diff --git a/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java b/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java
index 93dc43b..dd60dc4 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java
@@ -47,6 +47,9 @@
LayoutInflater inflater,
@Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
+ if (!android.os.Flags.allowPrivateProfile()) {
+ return null;
+ }
GlifLayout rootView =
(GlifLayout) inflater.inflate(
R.layout.privatespace_setlock_screen, container, false);
diff --git a/src/com/android/settings/privatespace/PrivateSpaceSetupActivity.java b/src/com/android/settings/privatespace/PrivateSpaceSetupActivity.java
index a5628c8..4eb61e5 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceSetupActivity.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceSetupActivity.java
@@ -36,6 +36,9 @@
private NavHostFragment mNavHostFragment;
@Override
protected void onCreate(Bundle savedInstanceState) {
+ if (!android.os.Flags.allowPrivateProfile()) {
+ return;
+ }
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
ThemeHelper.trySetDynamicColor(this);
super.onCreate(savedInstanceState);
diff --git a/src/com/android/settings/privatespace/SetupSuccessFragment.java b/src/com/android/settings/privatespace/SetupSuccessFragment.java
index 1868f65..f6796be 100644
--- a/src/com/android/settings/privatespace/SetupSuccessFragment.java
+++ b/src/com/android/settings/privatespace/SetupSuccessFragment.java
@@ -45,6 +45,9 @@
LayoutInflater inflater,
@Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
+ if (!android.os.Flags.allowPrivateProfile()) {
+ return null;
+ }
GlifLayout rootView =
(GlifLayout)
inflater.inflate(R.layout.privatespace_setup_success, container, false);
diff --git a/src/com/android/settings/privatespace/onelock/FaceFingerprintUnlockController.java b/src/com/android/settings/privatespace/onelock/FaceFingerprintUnlockController.java
index e976261..e130e4d 100644
--- a/src/com/android/settings/privatespace/onelock/FaceFingerprintUnlockController.java
+++ b/src/com/android/settings/privatespace/onelock/FaceFingerprintUnlockController.java
@@ -35,7 +35,7 @@
@Override
public boolean isAvailable() {
- return false;
+ return android.os.Flags.allowPrivateProfile();
}
@Override
diff --git a/src/com/android/settings/privatespace/onelock/PrivateSpaceLockController.java b/src/com/android/settings/privatespace/onelock/PrivateSpaceLockController.java
index 2783c1c..20298a1 100644
--- a/src/com/android/settings/privatespace/onelock/PrivateSpaceLockController.java
+++ b/src/com/android/settings/privatespace/onelock/PrivateSpaceLockController.java
@@ -73,7 +73,7 @@
@Override
public boolean isAvailable() {
- return true;
+ return android.os.Flags.allowPrivateProfile();
}
@Override
diff --git a/src/com/android/settings/privatespace/onelock/UseOneLockController.java b/src/com/android/settings/privatespace/onelock/UseOneLockController.java
index 5c461e0..31634b9 100644
--- a/src/com/android/settings/privatespace/onelock/UseOneLockController.java
+++ b/src/com/android/settings/privatespace/onelock/UseOneLockController.java
@@ -45,7 +45,7 @@
}
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ return android.os.Flags.allowPrivateProfile() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java b/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
index 218b870..04101b2 100644
--- a/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
+++ b/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
@@ -94,7 +94,7 @@
@Override
public boolean isAvailable() {
- return true;
+ return android.os.Flags.allowPrivateProfile();
}
@Override
diff --git a/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java b/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java
index 36f8448..459116a 100644
--- a/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java
+++ b/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java
@@ -19,6 +19,7 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
+import android.os.Bundle;
import androidx.annotation.Nullable;
@@ -35,6 +36,13 @@
public static final int UNUNIFY_PRIVATE_LOCK_FROM_DEVICE_REQUEST = 2;
@Override
+ public void onCreate(Bundle icicle) {
+ if (android.os.Flags.allowPrivateProfile()) {
+ super.onCreate(icicle);
+ }
+ }
+
+ @Override
public int getMetricsCategory() {
return SettingsEnums.PRIVATE_SPACE_SETTINGS;
}