Merge "Put stricter flag checks" into main (62692bf6) · Commits · e / os / android_packages_apps_Settings

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,13 @@ public class AutoAdvanceSetupFragment extends Fragment {
		}
		};

		@Override
		public void onCreate(@Nullable Bundle savedInstanceState) {
		if (android.os.Flags.allowPrivateProfile()) {
		super.onCreate(savedInstanceState);
		}
		}

		@Override
		public View onCreateView(
		LayoutInflater inflater,

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ public class DeletePrivateSpaceController extends BasePreferenceController {

		@Override
		public int getAvailabilityStatus() {
		return AVAILABLE;
		return android.os.Flags.allowPrivateProfile() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
		}

		@Override

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ public class HidePrivateSpaceController extends TogglePreferenceController {
		@Override
		@AvailabilityStatus
		public int getAvailabilityStatus() {
		return AVAILABLE;
		return android.os.Flags.allowPrivateProfile() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
		}

		@Override

+8 −0

Original line number	Diff line number	Diff line
		@@ -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;
		@@ -24,6 +25,13 @@ import com.android.settings.dashboard.DashboardFragment;
		public class HidePrivateSpaceSettings extends DashboardFragment{
		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;

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ public final class HidePrivateSpaceSummaryController extends BasePreferenceContr

		@Override
		public int getAvailabilityStatus() {
		return AVAILABLE;
		return android.os.Flags.allowPrivateProfile() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
		}

		@Override