Launch DO/PO sepecific settings when parental are enabled.

Test: make RunSettingsRoboTests && manual
Bug: 161861348

Change-Id: I73ce27d0aa740f47e6ed3e4be9bee4d5eaf039ad
This commit is contained in:
Jason Parks
2020-11-17 13:31:59 -06:00
parent 67a9908db4
commit 9f424cdec2
4 changed files with 72 additions and 1 deletions

View File

@@ -23,6 +23,7 @@ import android.util.FeatureFlagUtils;
import com.android.settings.core.FeatureFlags;
import com.android.settings.enterprise.EnterprisePrivacySettings;
import com.android.settings.overlay.FeatureFactory;
/**
* Top-level Settings activity
@@ -213,7 +214,11 @@ public class Settings extends SettingsActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (!EnterprisePrivacySettings.isPageEnabled(this)) {
if (FeatureFactory.getFactory(this)
.getEnterprisePrivacyFeatureProvider(this)
.showParentalControls()) {
finish();
} else if (!EnterprisePrivacySettings.isPageEnabled(this)) {
finish();
}
}