PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update EnterprisePrivacyFeatureProviderImpl to obtain the parental controls intent from SupervisionIntentProvider." into main

Browse Source
This commit is contained in:
Vitor Carvalho
2025-02-05 02:47:01 -08:00
committed by Android (Google) Code Review
parent 43dc7840ef ef34741cf2
commit a796ca497a
2 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
View File

@@ -37,6 +37,7 @@ import android.text.SpannableStringBuilder;
import com.android.settings.R;
import com.android.settings.vpn2.VpnUtils;
import com.android.settingslib.supervision.SupervisionIntentProvider;
import com.android.settingslib.utils.WorkPolicyUtils;
import java.util.Date;
@@ -44,6 +45,7 @@ import java.util.List;
public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFeatureProvider {
@Deprecated
public static final String ACTION_PARENTAL_CONTROLS =
"android.settings.SHOW_PARENTAL_CONTROLS";
@@ -243,7 +245,10 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
@Override
public boolean showParentalControls() {
Intent intent = getParentalControlsIntent();
Intent intent =
android.app.supervision.flags.Flags.deprecateDpmSupervisionApis()
? SupervisionIntentProvider.getSettingsIntent(mContext)
: getParentalControlsIntent();
if (intent != null) {
mContext.startActivity(intent);
return true;
@@ -261,6 +266,7 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
== UserProperties.SHOW_IN_QUIET_MODE_HIDDEN;
}
@Deprecated
private Intent getParentalControlsIntent() {
final ComponentName componentName =
mDpm.getProfileOwnerOrDeviceOwnerSupervisionComponent(new UserHandle(MY_USER_ID));