diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 2120be1ec531c..159ec4c2c5355 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -5111,10 +5111,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { boolean legacyApp = false; if (ai.targetSdkVersion <= Build.VERSION_CODES.M) { legacyApp = true; - } else if ("com.google.android.apps.enterprise.dmagent".equals(ai.packageName) - && ai.versionCode == 697) { - // TODO: STOPSHIP remove this (revert ag/895987) once a new prebuilt is dropped - legacyApp = true; } final int rawStatus = getEncryptionStatus();