From 1cfee793fcf8b4280b494ab12cbb3e88eb783485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martynas=20Petu=C5=A1ka?= <petuska@google.com>
Date: Thu, 17 Nov 2022 16:39:41 +0000
Subject: [PATCH] Fix appcompat usage for wipeData API

Bug: b/259407605
Test: Invoke wipeData API via TestDPC with targetSdkVersion <33
Change-Id: I8684b112a7d06a633be4d5a416c8272be1730a84
---
 .../server/devicepolicy/DevicePolicyManagerService.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 89cbf5324ed45..57b06235237a7 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -6880,7 +6880,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
 
             boolean isSystemUser = userId == UserHandle.USER_SYSTEM;
             boolean wipeDevice;
-            if (factoryReset == null || !CompatChanges.isChangeEnabled(EXPLICIT_WIPE_BEHAVIOUR)) {
+            if (factoryReset == null || !mInjector.isChangeEnabled(EXPLICIT_WIPE_BEHAVIOUR,
+                    admin.getPackageName(),
+                    userId)) {
                 // Legacy mode
                 wipeDevice = isSystemUser;
             } else {