Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c69f21c3 authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge \\"Remove the DMAgent whitelisting\\" into nyc-mr1-dev am: bf6c6b44 

am: 41fa9fe0

Change-Id: I5bbe059464a8719b92bf16997482382c7de02e99
parents 58736c6a 41fa9fe0

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+0 −4
Original line number Diff line number Diff line
@@ -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();