From b20a6c19ee6bf204798d456ee081e03c7f6036b5 Mon Sep 17 00:00:00 2001
From: Vitor Carvalho <vtrmc@google.com>
Date: Sun, 12 Jan 2025 22:58:25 +0000
Subject: Replace usage of DPM supervision methods in
 ParentalControlsUtilsInternal with calls to SupervisionManager.

Additional clients of this Internal class are updated in ag/31121556.

Bug: 382038943
Flag: android.app.supervision.flags.deprecate_dpm_supervision_apis
Test: atest ParentalControlsUtilsTest
Change-Id: I2ca701c0c9c6f9eba728bc41c5f997667ec4aeca
---
 .../enterprise/ActionDisabledByAdminControllerFactory.java          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'packages/SettingsLib/src')

diff --git a/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledByAdminControllerFactory.java b/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledByAdminControllerFactory.java
index e3d7902f34b2..00973811dbf0 100644
--- a/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledByAdminControllerFactory.java
+++ b/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledByAdminControllerFactory.java
@@ -84,7 +84,11 @@ public final class ActionDisabledByAdminControllerFactory {
             return false;
         }
         DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
-        return ParentalControlsUtilsInternal.parentConsentRequired(context, dpm,
+        final SupervisionManager sm =
+                android.app.supervision.flags.Flags.deprecateDpmSupervisionApis()
+                        ? context.getSystemService(SupervisionManager.class)
+                        : null;
+        return ParentalControlsUtilsInternal.parentConsentRequired(context, dpm, sm,
                 BiometricAuthenticator.TYPE_ANY_BIOMETRIC, new UserHandle(UserHandle.myUserId()));
     }
 
-- 
cgit v1.2.3-59-g8ed1b