commit 9f424cdec20f70d67c51b67512ee483499478af8
author Jason Parks <jparks@google.com> Tue Nov 17 13:31:59 2020 -0600
committer Jason Parks <jparks@google.com> Mon Nov 30 21:29:16 2020 +0000
tree c77bf35881c4c3bf2451620951578f4bcce4c017
parent 67a9908db4784ed95a76456117271fda04435d3d

Launch DO/PO sepecific settings when parental are enabled.

Test: make RunSettingsRoboTests && manual
Bug: 161861348

Change-Id: I73ce27d0aa740f47e6ed3e4be9bee4d5eaf039ad

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 588a2db..b226133 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -23,6 +23,7 @@
 
 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 @@
         @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();
             }
         }

src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java

diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
index 46f9b71..62f15b9 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
@@ -137,4 +137,10 @@
      * info" page. Returns {@code true} if the activity has indeed been launched.
      */
     boolean showWorkPolicyInfo();
+
+    /**
+     * Launches the parental controls settings page. Returns {@code true} if the activity has
+     * been launched.
+     */
+    boolean showParentalControls();
 }

src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java

diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index 429c537..7a5b489 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -40,6 +40,9 @@
 
 public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFeatureProvider {
 
+    public static final String ACTION_PARENTAL_CONTROLS =
+            "android.settings.SHOW_PARENTAL_CONTROLS";
+
     private final Context mContext;
     private final DevicePolicyManager mDpm;
     private final PackageManager mPm;
@@ -246,6 +249,34 @@
         return false;
     }
 
+    @Override
+    public boolean showParentalControls() {
+        Intent intent = getParentalControlsIntent();
+        if (intent != null) {
+            mContext.startActivity(intent);
+            return true;
+        }
+
+        return false;
+    }
+
+    private Intent getParentalControlsIntent() {
+        final ComponentName componentName =
+                mDpm.getProfileOwnerOrDeviceOwnerSupervisionComponent(new UserHandle(MY_USER_ID));
+        if (componentName == null) {
+            return null;
+        }
+
+        final Intent intent = new Intent(ACTION_PARENTAL_CONTROLS)
+                .setPackage(componentName.getPackageName())
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        final List<ResolveInfo> activities = mPm.queryIntentActivitiesAsUser(intent, 0, MY_USER_ID);
+        if (activities.size() != 0) {
+            return intent;
+        }
+        return null;
+    }
+
     private ComponentName getDeviceOwnerComponent() {
         if (!mPm.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN)) {
             return null;